| Message ID | 20230307065603.2253054-3-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0e0ee02e616269451dd00ff56be0328d5625a92 |
| Headers | show |
| Series | watchdog: s3c2410_wdt: Simplify using dev_err_probe() | expand |
On Tue, Mar 07, 2023 at 07:56:03AM +0100, Uwe Kleine-König wrote: > Make use of dev_err_probe() also for error paths that don't have to > handle -EPROBE_DEFER. While the code handing -EPROBE_DEFER isn't used > for these error paths, it still simpler as it cares for pretty printing > the error code and usually needs one code line less as it combines > message emitting and error returning. This also unifies the format of > the error messages. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/s3c2410_wdt.c | 29 ++++++++++------------------- > 1 file changed, 10 insertions(+), 19 deletions(-) > > diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c > index f3de8ef499c3..e14d6d9050ce 100644 > --- a/drivers/watchdog/s3c2410_wdt.c > +++ b/drivers/watchdog/s3c2410_wdt.c > @@ -601,10 +601,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt) > > err = of_property_read_u32(dev->of_node, > "samsung,cluster-index", &index); > - if (err) { > - dev_err(dev, "failed to get cluster index\n"); > - return -EINVAL; > - } > + if (err) > + return dev_err_probe(dev, -EINVAL, "failed to get cluster index\n"); > > switch (index) { > case 0: > @@ -615,8 +613,7 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt) > &drv_data_exynosautov9_cl1; > break; > default: > - dev_err(dev, "wrong cluster index: %u\n", index); > - return -EINVAL; > + return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index); > } > } > #endif > @@ -653,10 +650,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev) > if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { > wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, > "samsung,syscon-phandle"); > - if (IS_ERR(wdt->pmureg)) { > - dev_err(dev, "syscon regmap lookup failed.\n"); > - return PTR_ERR(wdt->pmureg); > - } > + if (IS_ERR(wdt->pmureg)) > + return dev_err_probe(dev, PTR_ERR(wdt->pmureg), "syscon regmap lookup failed.\n"); > } > > wdt_irq = platform_get_irq(pdev, 0); > @@ -694,21 +689,17 @@ static int s3c2410wdt_probe(struct platform_device *pdev) > if (ret) { > ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, > S3C2410_WATCHDOG_DEFAULT_TIME); > - if (ret == 0) { > + if (ret == 0) > dev_warn(dev, "tmr_margin value out of range, default %d used\n", > S3C2410_WATCHDOG_DEFAULT_TIME); > - } else { > - dev_err(dev, "failed to use default timeout\n"); > - return ret; > - } > + else > + return dev_err_probe(dev, ret, "failed to use default timeout\n"); > } > > ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0, > pdev->name, pdev); > - if (ret != 0) { > - dev_err(dev, "failed to install irq (%d)\n", ret); > - return ret; > - } > + if (ret != 0) > + return dev_err_probe(dev, ret, "failed to install irq (%d)\n", ret); > > watchdog_set_nowayout(&wdt->wdt_device, nowayout); > watchdog_set_restart_priority(&wdt->wdt_device, 128); > -- > 2.39.1 >
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index f3de8ef499c3..e14d6d9050ce 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -601,10 +601,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt) err = of_property_read_u32(dev->of_node, "samsung,cluster-index", &index); - if (err) { - dev_err(dev, "failed to get cluster index\n"); - return -EINVAL; - } + if (err) + return dev_err_probe(dev, -EINVAL, "failed to get cluster index\n"); switch (index) { case 0: @@ -615,8 +613,7 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt) &drv_data_exynosautov9_cl1; break; default: - dev_err(dev, "wrong cluster index: %u\n", index); - return -EINVAL; + return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index); } } #endif @@ -653,10 +650,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev) if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, "samsung,syscon-phandle"); - if (IS_ERR(wdt->pmureg)) { - dev_err(dev, "syscon regmap lookup failed.\n"); - return PTR_ERR(wdt->pmureg); - } + if (IS_ERR(wdt->pmureg)) + return dev_err_probe(dev, PTR_ERR(wdt->pmureg), "syscon regmap lookup failed.\n"); } wdt_irq = platform_get_irq(pdev, 0); @@ -694,21 +689,17 @@ static int s3c2410wdt_probe(struct platform_device *pdev) if (ret) { ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, S3C2410_WATCHDOG_DEFAULT_TIME); - if (ret == 0) { + if (ret == 0) dev_warn(dev, "tmr_margin value out of range, default %d used\n", S3C2410_WATCHDOG_DEFAULT_TIME); - } else { - dev_err(dev, "failed to use default timeout\n"); - return ret; - } + else + return dev_err_probe(dev, ret, "failed to use default timeout\n"); } ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0, pdev->name, pdev); - if (ret != 0) { - dev_err(dev, "failed to install irq (%d)\n", ret); - return ret; - } + if (ret != 0) + return dev_err_probe(dev, ret, "failed to install irq (%d)\n", ret); watchdog_set_nowayout(&wdt->wdt_device, nowayout); watchdog_set_restart_priority(&wdt->wdt_device, 128);
Make use of dev_err_probe() also for error paths that don't have to handle -EPROBE_DEFER. While the code handing -EPROBE_DEFER isn't used for these error paths, it still simpler as it cares for pretty printing the error code and usually needs one code line less as it combines message emitting and error returning. This also unifies the format of the error messages. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/watchdog/s3c2410_wdt.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)