aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-qcom-qspi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-03-07 16:46:18 +0000
committerMark Brown <broonie@kernel.org>2023-03-07 16:46:18 +0000
commit2289fa0704b8d074d256cfa43ceaa6ee620d5697 (patch)
treefc07a93b930f0b09cb265606358b4cd3cd960b9a /drivers/spi/spi-qcom-qspi.c
parentspi: Fix cocci warnings (diff)
parentspi: zynqmp-gqspi: Convert to platform remove callback returning void (diff)
downloadlinux-rng-2289fa0704b8d074d256cfa43ceaa6ee620d5697.tar.xz
linux-rng-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-qcom-qspi.c')
-rw-r--r--drivers/spi/spi-qcom-qspi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index c334dfec4117..15c4e21cd562 100644
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -552,7 +552,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
return ret;
}
-static int qcom_qspi_remove(struct platform_device *pdev)
+static void qcom_qspi_remove(struct platform_device *pdev)
{
struct spi_master *master = platform_get_drvdata(pdev);
@@ -560,8 +560,6 @@ static int qcom_qspi_remove(struct platform_device *pdev)
spi_unregister_master(master);
pm_runtime_disable(&pdev->dev);
-
- return 0;
}
static int __maybe_unused qcom_qspi_runtime_suspend(struct device *dev)
@@ -655,7 +653,7 @@ static struct platform_driver qcom_qspi_driver = {
.of_match_table = qcom_qspi_dt_match,
},
.probe = qcom_qspi_probe,
- .remove = qcom_qspi_remove,
+ .remove_new = qcom_qspi_remove,
};
module_platform_driver(qcom_qspi_driver);