Skip to content

Commit 2998efc

Browse files
Uwe Kleine-Königkwilczynski
authored andcommitted
PCI: rockchip-host: 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-14-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 4c3bc1b commit 2998efc

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pci/controller/pcie-rockchip-host.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
10091009
return err;
10101010
}
10111011

1012-
static int rockchip_pcie_remove(struct platform_device *pdev)
1012+
static void rockchip_pcie_remove(struct platform_device *pdev)
10131013
{
10141014
struct device *dev = &pdev->dev;
10151015
struct rockchip_pcie *rockchip = dev_get_drvdata(dev);
@@ -1029,8 +1029,6 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
10291029
regulator_disable(rockchip->vpcie3v3);
10301030
regulator_disable(rockchip->vpcie1v8);
10311031
regulator_disable(rockchip->vpcie0v9);
1032-
1033-
return 0;
10341032
}
10351033

10361034
static const struct dev_pm_ops rockchip_pcie_pm_ops = {
@@ -1051,7 +1049,7 @@ static struct platform_driver rockchip_pcie_driver = {
10511049
.pm = &rockchip_pcie_pm_ops,
10521050
},
10531051
.probe = rockchip_pcie_probe,
1054-
.remove = rockchip_pcie_remove,
1052+
.remove_new = rockchip_pcie_remove,
10551053
};
10561054
module_platform_driver(rockchip_pcie_driver);
10571055

0 commit comments

Comments
 (0)