diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-05-17 22:53:26 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-05-17 22:55:17 +0200 |
| commit | 14dc3ec5203ced2000ef157f147944233309c850 (patch) | |
| tree | c380ae7b31040b0ea72f90925bc694d018501952 | |
| parent | 52f0e7bc19fb1397aa9d29f87415f94d39bb8b01 (diff) | |
| download | linux-14dc3ec5203ced2000ef157f147944233309c850.tar.bz2 | |
rtc: ls1x: remove useless label and goto
The error handling in ls1x_rtc_probe used to release resources but since
it is using devm functions, it only returns a value. Make the code clearer
by returning directly instead of using goto.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
| -rw-r--r-- | drivers/rtc/rtc-ls1x.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c index 609bd1d013f0..8aa3f223621c 100644 --- a/drivers/rtc/rtc-ls1x.c +++ b/drivers/rtc/rtc-ls1x.c @@ -148,15 +148,13 @@ static int ls1x_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtcdev; unsigned long v; - int ret; v = readl(SYS_COUNTER_CNTRL); if (!(v & RTC_CNTR_OK)) { dev_err(&pdev->dev, "rtc counters not working\n"); - ret = -ENODEV; - goto err; + return -ENODEV; } - ret = -ETIMEDOUT; + /* set to 1 HZ if needed */ if (readl(SYS_TOYTRIM) != 32767) { v = 0x100000; @@ -165,7 +163,7 @@ static int ls1x_rtc_probe(struct platform_device *pdev) if (!v) { dev_err(&pdev->dev, "time out\n"); - goto err; + return -ETIMEDOUT; } writel(32767, SYS_TOYTRIM); } @@ -181,9 +179,6 @@ static int ls1x_rtc_probe(struct platform_device *pdev) rtcdev->ops = &ls1x_rtc_ops; return rtc_register_device(rtcdev); - -err: - return ret; } static struct platform_driver ls1x_rtc_driver = { |