rtc: pcf2123: remove useless error path goto
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 19 Aug 2019 18:26:53 +0000 (20:26 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 20 Aug 2019 19:42:13 +0000 (21:42 +0200)
kfree_exit only returns ret, remove it. This also fixes the
devm_regmap_init_spi error case where the probe wouldn't actually fail
because ret is initialized to 0.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20190819182656.29744-6-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-pcf2123.c

index df20dd2..aef0219 100644 (file)
@@ -390,10 +390,9 @@ static int pcf2123_probe(struct spi_device *spi)
        dev_set_drvdata(&spi->dev, pcf2123);
 
        pcf2123->map = devm_regmap_init_spi(spi, &pcf2123_regmap_config);
-
        if (IS_ERR(pcf2123->map)) {
                dev_err(&spi->dev, "regmap init failed.\n");
-               goto kfree_exit;
+               return PTR_ERR(pcf2123->map);
        }
 
        ret = pcf2123_rtc_read_time(&spi->dev, &tm);
@@ -401,7 +400,7 @@ static int pcf2123_probe(struct spi_device *spi)
                ret = pcf2123_reset(&spi->dev);
                if (ret < 0) {
                        dev_err(&spi->dev, "chip not found\n");
-                       goto kfree_exit;
+                       return ret;
                }
        }
 
@@ -414,8 +413,7 @@ static int pcf2123_probe(struct spi_device *spi)
 
        if (IS_ERR(rtc)) {
                dev_err(&spi->dev, "failed to register.\n");
-               ret = PTR_ERR(rtc);
-               goto kfree_exit;
+               return PTR_ERR(rtc);
        }
 
        pcf2123->rtc = rtc;
@@ -440,9 +438,6 @@ static int pcf2123_probe(struct spi_device *spi)
        pcf2123->rtc->uie_unsupported = 1;
 
        return 0;
-
-kfree_exit:
-       return ret;
 }
 
 #ifdef CONFIG_OF