Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a5aeaad authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20190819182656.29744-6-alexandre.belloni@bootlin.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 9126a2b1

drivers/rtc/rtc-pcf2123.c

+3 −8
Original line number Diff line number Diff line
@@ -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