leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: ls1x: remove useless label and goto

Browse Source 
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>
This commit is contained in:
Alexandre Belloni 2018-05-17 22:53:26 +02:00
parent 52f0e7bc19
commit 14dc3ec520
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/rtc-ls1x.c
View File

@ -148,15 +148,13 @@ static int ls1x_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtcdev; struct rtc_device *rtcdev;
unsigned long v; unsigned long v;
int ret;
v = readl(SYS_COUNTER_CNTRL); v = readl(SYS_COUNTER_CNTRL);
if (!(v & RTC_CNTR_OK)) { if (!(v & RTC_CNTR_OK)) {
dev_err(&pdev->dev, "rtc counters not working\n"); dev_err(&pdev->dev, "rtc counters not working\n");
ret = -ENODEV; return -ENODEV;
goto err;
} }
ret = -ETIMEDOUT;
/* set to 1 HZ if needed */ /* set to 1 HZ if needed */
if (readl(SYS_TOYTRIM) != 32767) { if (readl(SYS_TOYTRIM) != 32767) {
v = 0x100000; v = 0x100000;
@ -165,7 +163,7 @@ static int ls1x_rtc_probe(struct platform_device *pdev)
if (!v) { if (!v) {
dev_err(&pdev->dev, "time out\n"); dev_err(&pdev->dev, "time out\n");
goto err; return -ETIMEDOUT;
} }
writel(32767, SYS_TOYTRIM); writel(32767, SYS_TOYTRIM);
} }
@ -181,9 +179,6 @@ static int ls1x_rtc_probe(struct platform_device *pdev)
rtcdev->ops = &ls1x_rtc_ops; rtcdev->ops = &ls1x_rtc_ops;
return rtc_register_device(rtcdev); return rtc_register_device(rtcdev);
err:
return ret;
} }
static struct platform_driver ls1x_rtc_driver = { static struct platform_driver ls1x_rtc_driver = {