Unverified Commit a0386bba authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

spi: make remove callback a void function 



The value returned by an spi driver's remove function is mostly ignored.
(Only an error message is printed if the value is non-zero that the
error is ignored.)

So change the prototype of the remove function to return no value. This
way driver authors are not tempted to assume that passing an error to
the upper layer is a good idea. All drivers are adapted accordingly.
There is no intended change of behaviour, all callbacks were prepared to
return 0 before.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: default avatarClaudius Heine <ch@denx.de>
Acked-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Acked-by: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Acked-by: default avatarŁukasz Stelmach <l.stelmach@samsung.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220123175201.34839-6-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent afb0a80e

drivers/bus/moxtet.c

+1 −3
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ static int moxtet_probe(struct spi_device *spi) 
	return 0;

}



static int moxtet_remove(struct spi_device *spi)

static void moxtet_remove(struct spi_device *spi)

{

	struct moxtet *moxtet = spi_get_drvdata(spi);
@@ -828,8 +828,6 @@ static int moxtet_remove(struct spi_device *spi) 
	device_for_each_child(moxtet->dev, NULL, __unregister);



	mutex_destroy(&moxtet->lock);



	return 0;

}



static const struct of_device_id moxtet_dt_ids[] = {

drivers/char/tpm/st33zp24/spi.c

+1 −3
Original line number Diff line number Diff line
@@ -381,13 +381,11 @@ static int st33zp24_spi_probe(struct spi_device *dev) 
 * @param: client, the spi_device description (TPM SPI description).

 * @return: 0 in case of success.

 */

static int st33zp24_spi_remove(struct spi_device *dev)

static void st33zp24_spi_remove(struct spi_device *dev)

{

	struct tpm_chip *chip = spi_get_drvdata(dev);



	st33zp24_remove(chip);



	return 0;

}



static const struct spi_device_id st33zp24_spi_id[] = {

drivers/char/tpm/tpm_tis_spi_main.c

+1 −2
Original line number Diff line number Diff line
@@ -254,13 +254,12 @@ static int tpm_tis_spi_driver_probe(struct spi_device *spi) 


static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_spi_resume);



static int tpm_tis_spi_remove(struct spi_device *dev)

static void tpm_tis_spi_remove(struct spi_device *dev)

{

	struct tpm_chip *chip = spi_get_drvdata(dev);



	tpm_chip_unregister(chip);

	tpm_tis_remove(chip);

	return 0;

}



static const struct spi_device_id tpm_tis_spi_id[] = {

drivers/clk/clk-lmk04832.c

+1 −3
Original line number Diff line number Diff line
@@ -1544,14 +1544,12 @@ static int lmk04832_probe(struct spi_device *spi) 
	return ret;

}



static int lmk04832_remove(struct spi_device *spi)

static void lmk04832_remove(struct spi_device *spi)

{

	struct lmk04832 *lmk = spi_get_drvdata(spi);



	clk_disable_unprepare(lmk->oscin);

	of_clk_del_provider(spi->dev.of_node);



	return 0;

}

static const struct spi_device_id lmk04832_id[] = {

	{ "lmk04832", LMK04832 },

drivers/gpio/gpio-74x164.c

+1 −3
Original line number Diff line number Diff line
@@ -163,15 +163,13 @@ static int gen_74x164_probe(struct spi_device *spi) 
	return ret;

}



static int gen_74x164_remove(struct spi_device *spi)

static void gen_74x164_remove(struct spi_device *spi)

{

	struct gen_74x164_chip *chip = spi_get_drvdata(spi);



	gpiod_set_value_cansleep(chip->gpiod_oe, 0);

	gpiochip_remove(&chip->gpio_chip);

	mutex_destroy(&chip->lock);



	return 0;

}



static const struct spi_device_id gen_74x164_spi_ids[] = {