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-zynqmp-gqspi.c | |
| parent | 20064c47f63e995216e0dfb0a6ea37b653ed534c (diff) | |
| parent | 3ffefa1d9c9eba60c7f8b4a9ce2df3e4c7f4a88e (diff) | |
| download | linux-2289fa0704b8d074d256cfa43ceaa6ee620d5697.tar.gz linux-2289fa0704b8d074d256cfa43ceaa6ee620d5697.tar.bz2 linux-2289fa0704b8d074d256cfa43ceaa6ee620d5697.zip | |
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-zynqmp-gqspi.c')
| -rw-r--r-- | drivers/spi/spi-zynqmp-gqspi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 95ff15665d44..270d28a3f8eb 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -1364,7 +1364,7 @@ remove_master: * * Return: 0 Always */ -static int zynqmp_qspi_remove(struct platform_device *pdev) +static void zynqmp_qspi_remove(struct platform_device *pdev) { struct zynqmp_qspi *xqspi = platform_get_drvdata(pdev); @@ -1373,15 +1373,13 @@ static int zynqmp_qspi_remove(struct platform_device *pdev) clk_disable_unprepare(xqspi->pclk); pm_runtime_set_suspended(&pdev->dev); pm_runtime_disable(&pdev->dev); - - return 0; } MODULE_DEVICE_TABLE(of, zynqmp_qspi_of_match); static struct platform_driver zynqmp_qspi_driver = { .probe = zynqmp_qspi_probe, - .remove = zynqmp_qspi_remove, + .remove_new = zynqmp_qspi_remove, .driver = { .name = "zynqmp-qspi", .of_match_table = zynqmp_qspi_of_match, |