Skip to content

Commit

Permalink
rtc: au1xxx: remove goto label
Browse files Browse the repository at this point in the history
Simplify the driver by removing the goto label as it only does return ret.

Link: https://lore.kernel.org/r/20200306005958.39203-2-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
  • Loading branch information
Alexandre Belloni committed Mar 16, 2020
1 parent 7fc9790 commit 9cf71ed
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/rtc/rtc-au1xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,13 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
{
struct rtc_device *rtcdev;
unsigned long t;
int ret;

t = alchemy_rdsys(AU1000_SYS_CNTRCTRL);
if (!(t & CNTR_OK)) {
dev_err(&pdev->dev, "counters not working; aborting.\n");
ret = -ENODEV;
goto out_err;
return -ENODEV;
}

ret = -ETIMEDOUT;

/* set counter0 tickrate to 1Hz if necessary */
if (alchemy_rdsys(AU1000_SYS_TOYTRIM) != 32767) {
/* wait until hardware gives access to TRIM register */
Expand All @@ -88,7 +84,7 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
* counters are unusable.
*/
dev_err(&pdev->dev, "timeout waiting for access\n");
goto out_err;
return -ETIMEDOUT;
}

/* set 1Hz TOY tick rate */
Expand All @@ -108,9 +104,6 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, rtcdev);

return rtc_register_device(rtcdev);

out_err:
return ret;
}

static struct platform_driver au1xrtc_driver = {
Expand Down

0 comments on commit 9cf71ed

Please sign in to comment.