Skip to content

Commit dea8e70

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
spi: qup: 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 (mostly) ignored 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. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230330210341.2459548-3-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 61f4917 commit dea8e70

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/spi/spi-qup.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ static int spi_qup_resume(struct device *device)
12701270
}
12711271
#endif /* CONFIG_PM_SLEEP */
12721272

1273-
static int spi_qup_remove(struct platform_device *pdev)
1273+
static void spi_qup_remove(struct platform_device *pdev)
12741274
{
12751275
struct spi_master *master = dev_get_drvdata(&pdev->dev);
12761276
struct spi_qup *controller = spi_master_get_devdata(master);
@@ -1295,8 +1295,6 @@ static int spi_qup_remove(struct platform_device *pdev)
12951295

12961296
pm_runtime_put_noidle(&pdev->dev);
12971297
pm_runtime_disable(&pdev->dev);
1298-
1299-
return 0;
13001298
}
13011299

13021300
static const struct of_device_id spi_qup_dt_match[] = {
@@ -1321,7 +1319,7 @@ static struct platform_driver spi_qup_driver = {
13211319
.of_match_table = spi_qup_dt_match,
13221320
},
13231321
.probe = spi_qup_probe,
1324-
.remove = spi_qup_remove,
1322+
.remove_new = spi_qup_remove,
13251323
};
13261324
module_platform_driver(spi_qup_driver);
13271325

0 commit comments

Comments
 (0)