diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 21:10:40 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 21:10:40 +0300 |
| commit | eb30ad414169b7c41d32d726c8d4bb12031a5e68 (patch) | |
| tree | 887f45c8d47b11699aa988e824bb0217d65fcff2 /drivers/pci/controller/dwc/pci-keystone.c | |
| parent | fd286a1de5dd698b1cf02a1d3d22d13c832ff2fb (diff) | |
| parent | a5eee68931fcc6ecabd35651fed0c31439078e67 (diff) | |
| download | linux-eb30ad414169b7c41d32d726c8d4bb12031a5e68.tar.xz | |
Merge branch 'pci/controller/remove-void-return'
- Convert exynos, keystone, kirin from .remove() to .remove_new(), which
returns void instead of int (Uwe Kleine-König)
* pci/controller/remove-void-return:
PCI: kirin: Convert to platform remove callback returning void
PCI: keystone: Convert to platform remove callback returning void
PCI: exynos: Convert to platform remove callback returning void
Diffstat (limited to 'drivers/pci/controller/dwc/pci-keystone.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index da8a1b21adaa..1b54cd57768e 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -1311,7 +1311,7 @@ err_link: return ret; } -static int ks_pcie_remove(struct platform_device *pdev) +static void ks_pcie_remove(struct platform_device *pdev) { struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); struct device_link **link = ks_pcie->link; @@ -1323,13 +1323,11 @@ static int ks_pcie_remove(struct platform_device *pdev) ks_pcie_disable_phy(ks_pcie); while (num_lanes--) device_link_del(link[num_lanes]); - - return 0; } static struct platform_driver ks_pcie_driver = { .probe = ks_pcie_probe, - .remove = ks_pcie_remove, + .remove_new = ks_pcie_remove, .driver = { .name = "keystone-pcie", .of_match_table = ks_pcie_of_match, |