Skip to content

Commit 4fbd8b7

Browse files
Uwe Kleine-Königkwilczynski
authored andcommitted
PCI: exynos: 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/50de44ea8931465fd9cdc821854ea761cb43adf6.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 b85ea95 commit 4fbd8b7

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ static int exynos_pcie_probe(struct platform_device *pdev)
375375
return ret;
376376
}
377377

378-
static int exynos_pcie_remove(struct platform_device *pdev)
378+
static void exynos_pcie_remove(struct platform_device *pdev)
379379
{
380380
struct exynos_pcie *ep = platform_get_drvdata(pdev);
381381

@@ -385,8 +385,6 @@ static int exynos_pcie_remove(struct platform_device *pdev)
385385
phy_exit(ep->phy);
386386
exynos_pcie_deinit_clk_resources(ep);
387387
regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies);
388-
389-
return 0;
390388
}
391389

392390
static int exynos_pcie_suspend_noirq(struct device *dev)
@@ -431,7 +429,7 @@ static const struct of_device_id exynos_pcie_of_match[] = {
431429

432430
static struct platform_driver exynos_pcie_driver = {
433431
.probe = exynos_pcie_probe,
434-
.remove = exynos_pcie_remove,
432+
.remove_new = exynos_pcie_remove,
435433
.driver = {
436434
.name = "exynos-pcie",
437435
.of_match_table = exynos_pcie_of_match,

0 commit comments

Comments
 (0)