Skip to content

Commit

Permalink
xen/grant-dma-iommu: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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().

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: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20240307181135.191192-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Juergen Gross <jgross@suse.com>
  • Loading branch information
Uwe Kleine-König authored and Juergen Gross committed Mar 13, 2024
1 parent e8f897f commit cc87253
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/xen/grant-dma-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,12 @@ static int grant_dma_iommu_probe(struct platform_device *pdev)
return 0;
}

static int grant_dma_iommu_remove(struct platform_device *pdev)
static void grant_dma_iommu_remove(struct platform_device *pdev)
{
struct grant_dma_iommu_device *mmu = platform_get_drvdata(pdev);

platform_set_drvdata(pdev, NULL);
iommu_device_unregister(&mmu->iommu);

return 0;
}

static struct platform_driver grant_dma_iommu_driver = {
Expand All @@ -67,7 +65,7 @@ static struct platform_driver grant_dma_iommu_driver = {
.of_match_table = grant_dma_iommu_of_match,
},
.probe = grant_dma_iommu_probe,
.remove = grant_dma_iommu_remove,
.remove_new = grant_dma_iommu_remove,
};

static int __init grant_dma_iommu_init(void)
Expand Down

0 comments on commit cc87253

Please sign in to comment.