diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-07 19:46:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-07 19:46:18 +0300 |
| commit | 2289fa0704b8d074d256cfa43ceaa6ee620d5697 (patch) | |
| tree | fc07a93b930f0b09cb265606358b4cd3cd960b9a /drivers/spi/spi-cadence-quadspi.c | |
| parent | 20064c47f63e995216e0dfb0a6ea37b653ed534c (diff) | |
| parent | 3ffefa1d9c9eba60c7f8b4a9ce2df3e4c7f4a88e (diff) | |
| download | linux-2289fa0704b8d074d256cfa43ceaa6ee620d5697.tar.xz | |
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-cadence-quadspi.c')
| -rw-r--r-- | drivers/spi/spi-cadence-quadspi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index c789fa9e2177..463fd49f4f80 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1795,7 +1795,7 @@ probe_pm_failed: return ret; } -static int cqspi_remove(struct platform_device *pdev) +static void cqspi_remove(struct platform_device *pdev) { struct cqspi_st *cqspi = platform_get_drvdata(pdev); @@ -1809,8 +1809,6 @@ static int cqspi_remove(struct platform_device *pdev) pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - - return 0; } #ifdef CONFIG_PM_SLEEP @@ -1910,7 +1908,7 @@ MODULE_DEVICE_TABLE(of, cqspi_dt_ids); static struct platform_driver cqspi_platform_driver = { .probe = cqspi_probe, - .remove = cqspi_remove, + .remove_new = cqspi_remove, .driver = { .name = CQSPI_NAME, .pm = CQSPI_DEV_PM_OPS, |