Skip to content

Commit a5eee68

Browse files
Uwe Kleine-Königkwilczynski
authored andcommitted
PCI: kirin: 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/c3a51791d54deaa818b8526975fc4e16ef1090ce.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 93d61d3 commit a5eee68

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/pci/controller/dwc/pcie-kirin.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -741,15 +741,13 @@ static int kirin_pcie_power_on(struct platform_device *pdev,
741741
return ret;
742742
}
743743

744-
static int kirin_pcie_remove(struct platform_device *pdev)
744+
static void kirin_pcie_remove(struct platform_device *pdev)
745745
{
746746
struct kirin_pcie *kirin_pcie = platform_get_drvdata(pdev);
747747

748748
dw_pcie_host_deinit(&kirin_pcie->pci->pp);
749749

750750
kirin_pcie_power_off(kirin_pcie);
751-
752-
return 0;
753751
}
754752

755753
struct kirin_pcie_data {
@@ -818,7 +816,7 @@ static int kirin_pcie_probe(struct platform_device *pdev)
818816

819817
static struct platform_driver kirin_pcie_driver = {
820818
.probe = kirin_pcie_probe,
821-
.remove = kirin_pcie_remove,
819+
.remove_new = kirin_pcie_remove,
822820
.driver = {
823821
.name = "kirin-pcie",
824822
.of_match_table = kirin_pcie_match,

0 commit comments

Comments
 (0)