@@ -616,10 +616,8 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
ret = of_property_read_u32(dev->of_node,
"samsung,cluster-index", &index);
- if (ret) {
- dev_err(dev, "error %pe: failed to get cluster index\n", ERR_PTR(-EINVAL));
- return -EINVAL;
- }
+ if (ret)
+ return dev_err_probe(dev, -EINVAL, "failed to get cluster index\n");
switch (index) {
case 0:
@@ -631,8 +629,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
variant = &drv_data_exynosautov9_cl1;
break;
default:
- dev_err(dev, "error %pe: wrong cluster index: %u\n", ERR_PTR(-EINVAL), index);
- return -EINVAL;
+ return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index);
}
}
#endif
@@ -641,10 +638,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, "error %pe: syscon regmap lookup failed.\n", wdt->pmureg);
- 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);
@@ -682,21 +677,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, "error: %pe: failed to use default timeout\n", ERR_PTR(ret));
- 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, "error: %pe: failed to install irq\n", ERR_PTR(ret));
- return ret;
- }
+ if (ret != 0)
+ return dev_err_probe(dev, ret, "failed to install irq\n");
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 on line less to use as it combines message emitting and error returning. Apart from the reduction of line count, scripts/bloat-o-meter reports for this change (on an ARCH=arm allmodconfig build): add/remove: 1/1 grow/shrink: 1/2 up/down: 32/-144 (-112) 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(-)