Skip to content

Commit df7e471

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
spi: mt65xx: 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. Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230530081648.2199419-3-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 22f4072 commit df7e471

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/spi/spi-mt65xx.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
12691269
return 0;
12701270
}
12711271

1272-
static int mtk_spi_remove(struct platform_device *pdev)
1272+
static void mtk_spi_remove(struct platform_device *pdev)
12731273
{
12741274
struct spi_master *master = platform_get_drvdata(pdev);
12751275
struct mtk_spi *mdata = spi_master_get_devdata(master);
@@ -1294,8 +1294,6 @@ static int mtk_spi_remove(struct platform_device *pdev)
12941294

12951295
pm_runtime_put_noidle(&pdev->dev);
12961296
pm_runtime_disable(&pdev->dev);
1297-
1298-
return 0;
12991297
}
13001298

13011299
#ifdef CONFIG_PM_SLEEP
@@ -1415,7 +1413,7 @@ static struct platform_driver mtk_spi_driver = {
14151413
.of_match_table = mtk_spi_of_match,
14161414
},
14171415
.probe = mtk_spi_probe,
1418-
.remove = mtk_spi_remove,
1416+
.remove_new = mtk_spi_remove,
14191417
};
14201418

14211419
module_platform_driver(mtk_spi_driver);

0 commit comments

Comments
 (0)