rtc: au1xxx: remove goto label
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 6 Mar 2020 00:59:56 +0000 (01:59 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 16 Mar 2020 10:12:09 +0000 (11:12 +0100)
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>
drivers/rtc/rtc-au1xxx.c

index a13ac73..73aeb15 100644 (file)
@@ -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 */
@@ -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 */
@@ -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 = {