diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 12:10:40 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 12:10:40 -0600 |
| commit | eb30ad414169b7c41d32d726c8d4bb12031a5e68 (patch) | |
| tree | 887f45c8d47b11699aa988e824bb0217d65fcff2 /drivers/pci/controller/dwc/pci-exynos.c | |
| parent | fd286a1de5dd698b1cf02a1d3d22d13c832ff2fb (diff) | |
| parent | a5eee68931fcc6ecabd35651fed0c31439078e67 (diff) | |
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-exynos.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-exynos.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c index 673ae213203f..a33fa98a252e 100644 --- a/drivers/pci/controller/dwc/pci-exynos.c +++ b/drivers/pci/controller/dwc/pci-exynos.c @@ -375,7 +375,7 @@ fail_probe: return ret; } -static int exynos_pcie_remove(struct platform_device *pdev) +static void exynos_pcie_remove(struct platform_device *pdev) { struct exynos_pcie *ep = platform_get_drvdata(pdev); @@ -385,8 +385,6 @@ static int exynos_pcie_remove(struct platform_device *pdev) phy_exit(ep->phy); exynos_pcie_deinit_clk_resources(ep); regulator_bulk_disable(ARRAY_SIZE(ep->supplies), ep->supplies); - - return 0; } static int exynos_pcie_suspend_noirq(struct device *dev) @@ -431,7 +429,7 @@ static const struct of_device_id exynos_pcie_of_match[] = { static struct platform_driver exynos_pcie_driver = { .probe = exynos_pcie_probe, - .remove = exynos_pcie_remove, + .remove_new = exynos_pcie_remove, .driver = { .name = "exynos-pcie", .of_match_table = exynos_pcie_of_match, |