summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@bootlin.com>2019-08-19 20:26:53 +0200
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2019-08-20 21:42:13 +0200
commit9a5aeaad73ece38c77bc4c955ab3c9a4c5e3277f (patch)
tree5e3c878a39cac7860d2df5cd9d18049725c9ce7f /drivers/rtc
parent9126a2b16b678fd14fa2171e2f05395ecb229a2c (diff)
downloadlinux-9a5aeaad73ece38c77bc4c955ab3c9a4c5e3277f.tar.gz
linux-9a5aeaad73ece38c77bc4c955ab3c9a4c5e3277f.tar.bz2
linux-9a5aeaad73ece38c77bc4c955ab3c9a4c5e3277f.zip
rtc: pcf2123: remove useless error path goto
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>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-pcf2123.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
index df20dd229140..aef02193dbcc 100644
--- a/drivers/rtc/rtc-pcf2123.c
+++ b/drivers/rtc/rtc-pcf2123.c
@@ -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