Skip to content

Commit d8149d3

Browse files
Uwe Kleine-Königjoergroedel
authored andcommitted
iommu/mtk: 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> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20230321084125.337021-8-u.kleine-koenig@pengutronix.de Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 816a4af commit d8149d3

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/iommu/mtk_iommu.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)
13161316
return ret;
13171317
}
13181318

1319-
static int mtk_iommu_remove(struct platform_device *pdev)
1319+
static void mtk_iommu_remove(struct platform_device *pdev)
13201320
{
13211321
struct mtk_iommu_data *data = platform_get_drvdata(pdev);
13221322
struct mtk_iommu_bank_data *bank;
@@ -1338,7 +1338,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)
13381338
continue;
13391339
devm_free_irq(&pdev->dev, bank->irq, bank);
13401340
}
1341-
return 0;
13421341
}
13431342

13441343
static int __maybe_unused mtk_iommu_runtime_suspend(struct device *dev)
@@ -1595,7 +1594,7 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
15951594

15961595
static struct platform_driver mtk_iommu_driver = {
15971596
.probe = mtk_iommu_probe,
1598-
.remove = mtk_iommu_remove,
1597+
.remove_new = mtk_iommu_remove,
15991598
.driver = {
16001599
.name = "mtk-iommu",
16011600
.of_match_table = mtk_iommu_of_ids,

0 commit comments

Comments
 (0)