diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-07 16:46:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-07 16:46:18 +0000 |
| commit | 2289fa0704b8d074d256cfa43ceaa6ee620d5697 (patch) | |
| tree | fc07a93b930f0b09cb265606358b4cd3cd960b9a /drivers/spi/spi-sifive.c | |
| parent | 20064c47f63e995216e0dfb0a6ea37b653ed534c (diff) | |
| parent | 3ffefa1d9c9eba60c7f8b4a9ce2df3e4c7f4a88e (diff) | |
spi: Convert to platform remove callback returning
Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
This patch series adapts the platform drivers below drivers/spi
to use the .remove_new() callback. Compared to the traditional .remove()
callback .remove_new() returns no value. This is a good thing because
the driver core doesn't (and cannot) cope for errors during remove. The
only effect of a non-zero return value in .remove() is that the driver
core emits a warning. The device is removed anyhow and an early return
from .remove() usually yields a resource leak.
By changing the remove callback to return void driver authors cannot
reasonably assume any more that there is some kind of cleanup later.
All drivers touched here returned zero unconditionally in their remove
callback, so they could all be converted trivially to .remove_new().
Diffstat (limited to 'drivers/spi/spi-sifive.c')
| -rw-r--r-- | drivers/spi/spi-sifive.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index e29e85cee88a..055de44e0d22 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -415,7 +415,7 @@ put_master: return ret; } -static int sifive_spi_remove(struct platform_device *pdev) +static void sifive_spi_remove(struct platform_device *pdev) { struct spi_master *master = platform_get_drvdata(pdev); struct sifive_spi *spi = spi_master_get_devdata(master); @@ -423,8 +423,6 @@ static int sifive_spi_remove(struct platform_device *pdev) /* Disable all the interrupts just in case */ sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0); clk_disable_unprepare(spi->clk); - - return 0; } static int sifive_spi_suspend(struct device *dev) @@ -473,7 +471,7 @@ MODULE_DEVICE_TABLE(of, sifive_spi_of_match); static struct platform_driver sifive_spi_driver = { .probe = sifive_spi_probe, - .remove = sifive_spi_remove, + .remove_new = sifive_spi_remove, .driver = { .name = SIFIVE_SPI_DRIVER_NAME, .pm = &sifive_spi_pm_ops, |