Commit 1a47cda0 authored by Sam Protsenko's avatar Sam Protsenko Committed by Wim Van Sebroeck
Browse files

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: default avatarSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Reviewed-by: default avatarGuenter 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: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent e249d01b

drivers/watchdog/s3c2410_wdt.c

+4 −9
Original line number Diff line number Diff line
@@ -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;

}