Skip to content

Commit 2f2802d

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
spi: spi-ti-qspi: 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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Add an error message to the error path that returned an error before to replace the core's error message with more information. Apart from the different wording of the error message, this patch doesn't introduce a semantic difference. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20231105172649.3738556-2-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 424a816 commit 2f2802d

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

drivers/spi/spi-ti-qspi.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -907,21 +907,22 @@ static int ti_qspi_probe(struct platform_device *pdev)
907907
return ret;
908908
}
909909

910-
static int ti_qspi_remove(struct platform_device *pdev)
910+
static void ti_qspi_remove(struct platform_device *pdev)
911911
{
912912
struct ti_qspi *qspi = platform_get_drvdata(pdev);
913913
int rc;
914914

915915
rc = spi_master_suspend(qspi->master);
916-
if (rc)
917-
return rc;
916+
if (rc) {
917+
dev_alert(&pdev->dev, "spi_master_suspend() failed (%pe)\n",
918+
ERR_PTR(rc));
919+
return;
920+
}
918921

919922
pm_runtime_put_sync(&pdev->dev);
920923
pm_runtime_disable(&pdev->dev);
921924

922925
ti_qspi_dma_cleanup(qspi);
923-
924-
return 0;
925926
}
926927

927928
static const struct dev_pm_ops ti_qspi_pm_ops = {
@@ -930,7 +931,7 @@ static const struct dev_pm_ops ti_qspi_pm_ops = {
930931

931932
static struct platform_driver ti_qspi_driver = {
932933
.probe = ti_qspi_probe,
933-
.remove = ti_qspi_remove,
934+
.remove_new = ti_qspi_remove,
934935
.driver = {
935936
.name = "ti-qspi",
936937
.pm = &ti_qspi_pm_ops,

0 commit comments

Comments
 (0)