summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorSam Protsenko <semen.protsenko@linaro.org>2021-11-21 18:56:46 +0200
committerWim Van Sebroeck <wim@linux-watchdog.org>2021-12-28 13:59:05 +0100
commit1a47cda07af4d81a49a140b52220ca56cd6e79a6 (patch)
treec7755e3f6a0d8bd58845246b177f9392fabcfd72 /drivers/watchdog
parente249d01b5e8b8263ee2fdb787c954450940a7677 (diff)
downloadlinux-1a47cda07af4d81a49a140b52220ca56cd6e79a6.tar.gz
linux-1a47cda07af4d81a49a140b52220ca56cd6e79a6.tar.bz2
linux-1a47cda07af4d81a49a140b52220ca56cd6e79a6.zip
watchdog: s3c2410: Remove superfluous err label
'err' label in probe function is not really need, it just returns. Remove it and replace all 'goto' statements with actual returns in place. No functional change here, just a cleanup patch. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20211107202943.8859-12-semen.protsenko@linaro.org [groeck: Fixed context conflicts] Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 924e0c17de76..62d797a8bfdf 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -627,22 +627,18 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (wdt_irq == NULL) {
dev_err(dev, "no irq resource specified\n");
- ret = -ENOENT;
- goto err;
+ return -ENOENT;
}
/* get the memory region for the watchdog timer */
wdt->reg_base = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(wdt->reg_base)) {
- ret = PTR_ERR(wdt->reg_base);
- goto err;
- }
+ if (IS_ERR(wdt->reg_base))
+ return PTR_ERR(wdt->reg_base);
wdt->bus_clk = devm_clk_get(dev, "watchdog");
if (IS_ERR(wdt->bus_clk)) {
dev_err(dev, "failed to find bus clock\n");
- ret = PTR_ERR(wdt->bus_clk);
- goto err;
+ return PTR_ERR(wdt->bus_clk);
}
ret = clk_prepare_enable(wdt->bus_clk);
@@ -757,7 +753,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
err_bus_clk:
clk_disable_unprepare(wdt->bus_clk);
- err:
return ret;
}