Skip to content

Commit 4c3bc1b

Browse files
Uwe Kleine-Königkwilczynski
authored andcommitted
PCI: mvebu: 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. Link: https://lore.kernel.org/linux-pci/20230321193208.366561-13-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
1 parent 8c47ac2 commit 4c3bc1b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pci/controller/pci-mvebu.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
16491649
return pci_host_probe(bridge);
16501650
}
16511651

1652-
static int mvebu_pcie_remove(struct platform_device *pdev)
1652+
static void mvebu_pcie_remove(struct platform_device *pdev)
16531653
{
16541654
struct mvebu_pcie *pcie = platform_get_drvdata(pdev);
16551655
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
@@ -1707,8 +1707,6 @@ static int mvebu_pcie_remove(struct platform_device *pdev)
17071707
/* Power down card and disable clocks. Must be the last step. */
17081708
mvebu_pcie_powerdown(port);
17091709
}
1710-
1711-
return 0;
17121710
}
17131711

17141712
static const struct of_device_id mvebu_pcie_of_match_table[] = {
@@ -1730,7 +1728,7 @@ static struct platform_driver mvebu_pcie_driver = {
17301728
.pm = &mvebu_pcie_pm_ops,
17311729
},
17321730
.probe = mvebu_pcie_probe,
1733-
.remove = mvebu_pcie_remove,
1731+
.remove_new = mvebu_pcie_remove,
17341732
};
17351733
module_platform_driver(mvebu_pcie_driver);
17361734

0 commit comments

Comments
 (0)