leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: pcf2123: remove useless error path goto

Browse Source 
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>
This commit is contained in:
Alexandre Belloni
2019-08-19 20:26:53 +02:00
parent 9126a2b16b
commit 9a5aeaad73
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/rtc-pcf2123.c
View File

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