tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

watchdog: s3c2410_wdt: Simplify using dev_err_probe()

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>
Link: https://lore.kernel.org/r/20230307065603.2253054-3-u.kleine-koenig@pengutronix.de
[groeck: Split long line to avoid checkpatch warning]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

authored by

Uwe Kleine-König and committed by
Wim Van Sebroeck e0e0ee02 16d477a1

+11 -19
+11 -19
drivers/watchdog/s3c2410_wdt.c
··· 601 601 602 602 err = of_property_read_u32(dev->of_node, 603 603 "samsung,cluster-index", &index); 604 - if (err) { 605 - dev_err(dev, "failed to get cluster index\n"); 606 - return -EINVAL; 607 - } 604 + if (err) 605 + return dev_err_probe(dev, -EINVAL, "failed to get cluster index\n"); 608 606 609 607 switch (index) { 610 608 case 0: ··· 613 615 &drv_data_exynosautov9_cl1; 614 616 break; 615 617 default: 616 - dev_err(dev, "wrong cluster index: %u\n", index); 617 - return -EINVAL; 618 + return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index); 618 619 } 619 620 } 620 621 #endif ··· 650 653 if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { 651 654 wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, 652 655 "samsung,syscon-phandle"); 653 - if (IS_ERR(wdt->pmureg)) { 654 - dev_err(dev, "syscon regmap lookup failed.\n"); 655 - return PTR_ERR(wdt->pmureg); 656 - } 656 + if (IS_ERR(wdt->pmureg)) 657 + return dev_err_probe(dev, PTR_ERR(wdt->pmureg), 658 + "syscon regmap lookup failed.\n"); 657 659 } 658 660 659 661 wdt_irq = platform_get_irq(pdev, 0); ··· 690 694 if (ret) { 691 695 ret = s3c2410wdt_set_heartbeat(&wdt->wdt_device, 692 696 S3C2410_WATCHDOG_DEFAULT_TIME); 693 - if (ret == 0) { 697 + if (ret == 0) 694 698 dev_warn(dev, "tmr_margin value out of range, default %d used\n", 695 699 S3C2410_WATCHDOG_DEFAULT_TIME); 696 - } else { 697 - dev_err(dev, "failed to use default timeout\n"); 698 - return ret; 699 - } 700 + else 701 + return dev_err_probe(dev, ret, "failed to use default timeout\n"); 700 702 } 701 703 702 704 ret = devm_request_irq(dev, wdt_irq, s3c2410wdt_irq, 0, 703 705 pdev->name, pdev); 704 - if (ret != 0) { 705 - dev_err(dev, "failed to install irq (%d)\n", ret); 706 - return ret; 707 - } 706 + if (ret != 0) 707 + return dev_err_probe(dev, ret, "failed to install irq (%d)\n", ret); 708 708 709 709 watchdog_set_nowayout(&wdt->wdt_device, nowayout); 710 710 watchdog_set_restart_priority(&wdt->wdt_device, 128);