Commit 9cf71edb authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: au1xxx: remove goto label

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.comSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 7fc9790a
...@@ -65,17 +65,13 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev) ...@@ -65,17 +65,13 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtcdev; struct rtc_device *rtcdev;
unsigned long t; unsigned long t;
int ret;
t = alchemy_rdsys(AU1000_SYS_CNTRCTRL); t = alchemy_rdsys(AU1000_SYS_CNTRCTRL);
if (!(t & CNTR_OK)) { if (!(t & CNTR_OK)) {
dev_err(&pdev->dev, "counters not working; aborting.\n"); dev_err(&pdev->dev, "counters not working; aborting.\n");
ret = -ENODEV; return -ENODEV;
goto out_err;
} }
ret = -ETIMEDOUT;
/* set counter0 tickrate to 1Hz if necessary */ /* set counter0 tickrate to 1Hz if necessary */
if (alchemy_rdsys(AU1000_SYS_TOYTRIM) != 32767) { if (alchemy_rdsys(AU1000_SYS_TOYTRIM) != 32767) {
/* wait until hardware gives access to TRIM register */ /* wait until hardware gives access to TRIM register */
...@@ -88,7 +84,7 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev) ...@@ -88,7 +84,7 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
* counters are unusable. * counters are unusable.
*/ */
dev_err(&pdev->dev, "timeout waiting for access\n"); dev_err(&pdev->dev, "timeout waiting for access\n");
goto out_err; return -ETIMEDOUT;
} }
/* set 1Hz TOY tick rate */ /* set 1Hz TOY tick rate */
...@@ -108,9 +104,6 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev) ...@@ -108,9 +104,6 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, rtcdev); platform_set_drvdata(pdev, rtcdev);
return rtc_register_device(rtcdev); return rtc_register_device(rtcdev);
out_err:
return ret;
} }
static struct platform_driver au1xrtc_driver = { static struct platform_driver au1xrtc_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment