diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 19:10:40 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-01-15 19:10:40 +0100 |
| commit | eb30ad414169b7c41d32d726c8d4bb12031a5e68 (patch) | |
| tree | 887f45c8d47b11699aa988e824bb0217d65fcff2 /drivers/pci/controller/dwc/pcie-kirin.c | |
| parent | Merge branch 'pci/controller/xilinx' (diff) | |
| parent | PCI: kirin: Convert to platform remove callback returning void (diff) | |
| download | linux-eb30ad414169b7c41d32d726c8d4bb12031a5e68.tar.xz linux-eb30ad414169b7c41d32d726c8d4bb12031a5e68.zip | |
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/pcie-kirin.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-kirin.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c index 9dfdf1fc9a36..d5523f302102 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -738,15 +738,13 @@ err: return ret; } -static int kirin_pcie_remove(struct platform_device *pdev) +static void kirin_pcie_remove(struct platform_device *pdev) { struct kirin_pcie *kirin_pcie = platform_get_drvdata(pdev); dw_pcie_host_deinit(&kirin_pcie->pci->pp); kirin_pcie_power_off(kirin_pcie); - - return 0; } struct kirin_pcie_data { @@ -815,7 +813,7 @@ static int kirin_pcie_probe(struct platform_device *pdev) static struct platform_driver kirin_pcie_driver = { .probe = kirin_pcie_probe, - .remove = kirin_pcie_remove, + .remove_new = kirin_pcie_remove, .driver = { .name = "kirin-pcie", .of_match_table = kirin_pcie_match, |