summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2023-03-03 18:20:20 +0100
committerMark Brown <broonie@kernel.org>2023-03-06 21:18:08 +0000
commitdee2e25572e42faa581b6c86cd1252546680362a (patch)
tree742b03f0955bc4c6fcdfa336760190a278c7f06f
parent80dc51da19cebaf85b03d910cbf4e56af165b0ff (diff)
downloadlinux-stable-dee2e25572e42faa581b6c86cd1252546680362a.tar.gz
linux-stable-dee2e25572e42faa581b6c86cd1252546680362a.tar.bz2
linux-stable-dee2e25572e42faa581b6c86cd1252546680362a.zip
spi: sh: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230303172041.2103336-67-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-sh.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-sh.c b/drivers/spi/spi-sh.c
index 3e72fad99adf..d358a2a9c3f5 100644
--- a/drivers/spi/spi-sh.c
+++ b/drivers/spi/spi-sh.c
@@ -377,14 +377,12 @@ static irqreturn_t spi_sh_irq(int irq, void *_ss)
return IRQ_HANDLED;
}
-static int spi_sh_remove(struct platform_device *pdev)
+static void spi_sh_remove(struct platform_device *pdev)
{
struct spi_sh_data *ss = platform_get_drvdata(pdev);
spi_unregister_master(ss->master);
free_irq(ss->irq, ss);
-
- return 0;
}
static int spi_sh_probe(struct platform_device *pdev)
@@ -461,7 +459,7 @@ static int spi_sh_probe(struct platform_device *pdev)
static struct platform_driver spi_sh_driver = {
.probe = spi_sh_probe,
- .remove = spi_sh_remove,
+ .remove_new = spi_sh_remove,
.driver = {
.name = "sh_spi",
},