Skip to content

Commit 93d61d3

Browse files
Uwe Kleine-Königkwilczynski
authored andcommitted
PCI: keystone: 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 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(). In the error path emit an error message replacing the (less useful) message by the core. Apart from the improved error message there is no change in behaviour. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Link: https://lore.kernel.org/linux-pci/06612aff79dfb52d5b0b20129dff5e4b1f04d3a7.1701682617.git.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 4fbd8b7 commit 93d61d3

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,7 @@ static int ks_pcie_probe(struct platform_device *pdev)
13021302
return ret;
13031303
}
13041304

1305-
static int ks_pcie_remove(struct platform_device *pdev)
1305+
static void ks_pcie_remove(struct platform_device *pdev)
13061306
{
13071307
struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);
13081308
struct device_link **link = ks_pcie->link;
@@ -1314,13 +1314,11 @@ static int ks_pcie_remove(struct platform_device *pdev)
13141314
ks_pcie_disable_phy(ks_pcie);
13151315
while (num_lanes--)
13161316
device_link_del(link[num_lanes]);
1317-
1318-
return 0;
13191317
}
13201318

13211319
static struct platform_driver ks_pcie_driver = {
13221320
.probe = ks_pcie_probe,
1323-
.remove = ks_pcie_remove,
1321+
.remove_new = ks_pcie_remove,
13241322
.driver = {
13251323
.name = "keystone-pcie",
13261324
.of_match_table = ks_pcie_of_match,

0 commit comments

Comments
 (0)