PCI: controller: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("platform: Make platform_driver::remove() return
void") .remove() is (again) the right callback to implement for platform
drivers.

Convert all PCI controller drivers to use .remove(), with the eventual goal
to drop struct platform_driver::remove_new(). As .remove() and .remove_new()
have the same prototypes, conversion is done by just changing the structure
member name in the driver initializer.

Link: https://lore.kernel.org/r/20240923065706.728769-1-sergio.paracuellos@gmail.com
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
[bhelgaas: add pcie-xilinx-nwl.c and tidy whitespace per Uwe Kleine-König:
https://lore.kernel.org/r/tdxrmmqyzcufupnwkdbg7lwgadizm7v3lxjirykijbml7x54ze@upbdzycdsilm]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c
index 284f2e0e4d261561819534f4861db60ced7166f2..ca24df2369769b87f439bb6b82102efb31f461c1 100644 (file)
--- a/drivers/pci/controller/cadence/pci-j721e.c
+++ b/drivers/pci/controller/cadence/pci-j721e.c
@@ -712,7 +712,7 @@ static DEFINE_NOIRQ_DEV_PM_OPS(j721e_pcie_pm_ops,
 
 static struct platform_driver j721e_pcie_driver = {
        .probe  = j721e_pcie_probe,
-       .remove_new = j721e_pcie_remove,
+       .remove = j721e_pcie_remove,
        .driver = {
                .name   = "j721e-pcie",
                .of_match_table = of_j721e_pcie_match,

diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c
index fa45da28a218b528b1d25860d48cae42b664bf7e..6a830166d37fff5bbbc35aaa7cc1b67b03e6ec3b 100644 (file)
--- a/drivers/pci/controller/dwc/pci-exynos.c
+++ b/drivers/pci/controller/dwc/pci-exynos.c
@@ -383,7 +383,7 @@ static const struct of_device_id exynos_pcie_of_match[] = {
 
 static struct platform_driver exynos_pcie_driver = {
        .probe          = exynos_pcie_probe,
-       .remove_new     = exynos_pcie_remove,
+       .remove         = exynos_pcie_remove,
        .driver = {
                .name   = "exynos-pcie",
                .of_match_table = exynos_pcie_of_match,

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 2219b1a866faf2d7b13e2d4c450a48f6697e0e41..b82e13e65e1af4767fdd0af6140239ff4f19f299 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -1363,7 +1363,7 @@ static void ks_pcie_remove(struct platform_device *pdev)
 
 static struct platform_driver ks_pcie_driver = {
        .probe  = ks_pcie_probe,
-       .remove_new = ks_pcie_remove,
+       .remove = ks_pcie_remove,
        .driver = {
                .name   = "keystone-pcie",
                .of_match_table = ks_pcie_of_match,

diff --git a/drivers/pci/controller/dwc/pcie-bt1.c b/drivers/pci/controller/dwc/pcie-bt1.c
index 76d0ddea80075716a796c5d625cdd51f8cd8afd2..1340edc18d1285be91262ae53072b7095d2d2183 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-bt1.c
+++ b/drivers/pci/controller/dwc/pcie-bt1.c
@@ -632,7 +632,7 @@ MODULE_DEVICE_TABLE(of, bt1_pcie_of_match);
 
 static struct platform_driver bt1_pcie_driver = {
        .probe = bt1_pcie_probe,
-       .remove_new = bt1_pcie_remove,
+       .remove = bt1_pcie_remove,
        .driver = {
                .name   = "bt1-pcie",
                .of_match_table = bt1_pcie_of_match,

diff --git a/drivers/pci/controller/dwc/pcie-histb.c b/drivers/pci/controller/dwc/pcie-histb.c
index 7a11c618b9d9c46a851ca71eb10a88681d9e0892..615a0e3e6d7eb5ee35123acbf7fc5f3defcc0cee 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-histb.c
+++ b/drivers/pci/controller/dwc/pcie-histb.c
@@ -439,7 +439,7 @@ MODULE_DEVICE_TABLE(of, histb_pcie_of_match);
 
 static struct platform_driver histb_pcie_platform_driver = {
        .probe  = histb_pcie_probe,
-       .remove_new = histb_pcie_remove,
+       .remove = histb_pcie_remove,
        .driver = {
                .name = "histb-pcie",
                .of_match_table = histb_pcie_of_match,

diff --git a/drivers/pci/controller/dwc/pcie-intel-gw.c b/drivers/pci/controller/dwc/pcie-intel-gw.c
index 676d2aba4fbdece16fc994f42e841ce701615ce1..9b53b8f6f268e2a91eedeeb7d08db07c32fcf840 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-intel-gw.c
+++ b/drivers/pci/controller/dwc/pcie-intel-gw.c
@@ -443,7 +443,7 @@ static const struct of_device_id of_intel_pcie_match[] = {
 
 static struct platform_driver intel_pcie_driver = {
        .probe = intel_pcie_probe,
-       .remove_new = intel_pcie_remove,
+       .remove = intel_pcie_remove,
        .driver = {
                .name = "intel-gw-pcie",
                .of_match_table = of_intel_pcie_match,

diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c
index 85a2c77b1835af5f9f8f14b62442c82bbceac0eb..1b2088acb538b83a1cab5e0aa71f296c748f5456 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-kirin.c
+++ b/drivers/pci/controller/dwc/pcie-kirin.c
@@ -769,7 +769,7 @@ static int kirin_pcie_probe(struct platform_device *pdev)
 
 static struct platform_driver kirin_pcie_driver = {
        .probe                  = kirin_pcie_probe,
-       .remove_new             = kirin_pcie_remove,
+       .remove                 = kirin_pcie_remove,
        .driver                 = {
                .name                   = "kirin-pcie",
                .of_match_table         = kirin_pcie_match,

diff --git a/drivers/pci/controller/dwc/pcie-qcom-ep.c b/drivers/pci/controller/dwc/pcie-qcom-ep.c
index e588fcc54589361bdeb15a7f82b79bc01c4afe6a..d663c5206450569ce6313d97ddc049ddb4b1cfb5 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-qcom-ep.c
+++ b/drivers/pci/controller/dwc/pcie-qcom-ep.c
@@ -937,7 +937,7 @@ MODULE_DEVICE_TABLE(of, qcom_pcie_ep_match);
 
 static struct platform_driver qcom_pcie_ep_driver = {
        .probe  = qcom_pcie_ep_probe,
-       .remove_new = qcom_pcie_ep_remove,
+       .remove = qcom_pcie_ep_remove,
        .driver = {
                .name = "qcom-pcie-ep",
                .of_match_table = qcom_pcie_ep_match,

diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
index 3a5511c3f7d97053a853ecd0460c02ce592a305e..fc872dd35029c083da58144dce23cd1ce80f9374 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
+++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@ -775,7 +775,7 @@ static struct platform_driver rcar_gen4_pcie_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .probe = rcar_gen4_pcie_probe,
-       .remove_new = rcar_gen4_pcie_remove,
+       .remove = rcar_gen4_pcie_remove,
 };
 module_platform_driver(rcar_gen4_pcie_driver);
 

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index c1394f2ab63ff1e2a47e42f4946d6102c75d2899..f4bd7f5275cfb81eebbcfa657c2777ce5538d5ea 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -2493,7 +2493,7 @@ static const struct dev_pm_ops tegra_pcie_dw_pm_ops = {
 
 static struct platform_driver tegra_pcie_dw_driver = {
        .probe = tegra_pcie_dw_probe,
-       .remove_new = tegra_pcie_dw_remove,
+       .remove = tegra_pcie_dw_remove,
        .shutdown = tegra_pcie_dw_shutdown,
        .driver = {
                .name   = "tegra194-pcie",

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index a598a98247ce91d2a635f038ba1c139326de5a09..a29796cce420a209ca64f0a6b628e34acb224ca5 100644 (file)
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1996,7 +1996,7 @@ static struct platform_driver advk_pcie_driver = {
                .of_match_table = advk_pcie_of_match_table,
        },
        .probe = advk_pcie_probe,
-       .remove_new = advk_pcie_remove,
+       .remove = advk_pcie_remove,
 };
 module_platform_driver(advk_pcie_driver);
 

diff --git a/drivers/pci/controller/pci-host-generic.c b/drivers/pci/controller/pci-host-generic.c
index 5f06f94db7b17ed000d068c8b19ea4a5c489cd99..4051b9b61dace669422e5a6453cc9f58a081beb5 100644 (file)
--- a/drivers/pci/controller/pci-host-generic.c
+++ b/drivers/pci/controller/pci-host-generic.c
@@ -82,7 +82,7 @@ static struct platform_driver gen_pci_driver = {
                .of_match_table = gen_pci_of_match,
        },
        .probe = pci_host_common_probe,
-       .remove_new = pci_host_common_remove,
+       .remove = pci_host_common_remove,
 };
 module_platform_driver(gen_pci_driver);
 

diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 29fe09c99e7d9c99a70b6cc120ad36cf47c9ad4b..46d3afe1d30819512fb6ea6ff53addd3e85bc5a5 100644 (file)
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -1727,7 +1727,7 @@ static struct platform_driver mvebu_pcie_driver = {
                .pm = &mvebu_pcie_pm_ops,
        },
        .probe = mvebu_pcie_probe,
-       .remove_new = mvebu_pcie_remove,
+       .remove = mvebu_pcie_remove,
 };
 module_platform_driver(mvebu_pcie_driver);
 

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index d7517c3976e7f194076c7264fb4fd7c6c169b6ca..1f0a872790e57ec73e9309f93c853c863a58b33e 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -2800,6 +2800,6 @@ static struct platform_driver tegra_pcie_driver = {
                .pm = &tegra_pcie_pm_ops,
        },
        .probe = tegra_pcie_probe,
-       .remove_new = tegra_pcie_remove,
+       .remove = tegra_pcie_remove,
 };
 module_platform_driver(tegra_pcie_driver);

diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c
index 3ce38dfd0d29f7c779659e1169028a07bcae198d..88c0977bc41a49042881fde38c4d77b39d1e5e9d 100644 (file)
--- a/drivers/pci/controller/pci-xgene-msi.c
+++ b/drivers/pci/controller/pci-xgene-msi.c
@@ -518,7 +518,7 @@ static struct platform_driver xgene_msi_driver = {
                .of_match_table = xgene_msi_match_table,
        },
        .probe = xgene_msi_probe,
-       .remove_new = xgene_msi_remove,
+       .remove = xgene_msi_remove,
 };
 
 static int __init xgene_pcie_msi_init(void)

diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index e36a6e158d23c1a521ebe6d23b0776898fedeeb8..e1cee3c0575fbd84ade1b8098ad9763efe6a0854 100644 (file)
--- a/drivers/pci/controller/pcie-altera-msi.c
+++ b/drivers/pci/controller/pcie-altera-msi.c
@@ -267,7 +267,7 @@ static struct platform_driver altera_msi_driver = {
                .of_match_table = altera_msi_of_match,
        },
        .probe = altera_msi_probe,
-       .remove_new = altera_msi_remove,
+       .remove = altera_msi_remove,
 };
 
 static int __init altera_msi_init(void)

diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
index 650b2dd81c48225573a6d6cde6d527898d603094..eb55a7f8573a86f630f2a667fa331733801474d0 100644 (file)
--- a/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@ -815,10 +815,10 @@ static void altera_pcie_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver altera_pcie_driver = {
-       .probe          = altera_pcie_probe,
-       .remove_new     = altera_pcie_remove,
+       .probe = altera_pcie_probe,
+       .remove = altera_pcie_remove,
        .driver = {
-               .name   = "altera-pcie",
+               .name = "altera-pcie",
                .of_match_table = altera_pcie_of_match,
        },
 };

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index 9321280f6edbabb959a249b7cd7677827da41721..e733a27dc8df8ef2ddb20cf9766c926cf5562778 100644 (file)
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -1928,7 +1928,7 @@ static const struct dev_pm_ops brcm_pcie_pm_ops = {
 
 static struct platform_driver brcm_pcie_driver = {
        .probe = brcm_pcie_probe,
-       .remove_new = brcm_pcie_remove,
+       .remove = brcm_pcie_remove,
        .driver = {
                .name = "brcm-pcie",
                .of_match_table = brcm_pcie_match,

diff --git a/drivers/pci/controller/pcie-hisi-error.c b/drivers/pci/controller/pcie-hisi-error.c
index ad9d5ffcd9e344efc6f26a35d8869ebf7ba78ab8..aaf1ed2b6e5971c98d404583561dfb1b7d0a279a 100644 (file)
--- a/drivers/pci/controller/pcie-hisi-error.c
+++ b/drivers/pci/controller/pcie-hisi-error.c
@@ -317,7 +317,7 @@ static struct platform_driver hisi_pcie_error_handler_driver = {
                .acpi_match_table = hisi_pcie_acpi_match,
        },
        .probe          = hisi_pcie_error_handler_probe,
-       .remove_new     = hisi_pcie_error_handler_remove,
+       .remove         = hisi_pcie_error_handler_remove,
 };
 module_platform_driver(hisi_pcie_error_handler_driver);
 

diff --git a/drivers/pci/controller/pcie-iproc-platform.c b/drivers/pci/controller/pcie-iproc-platform.c
index 4e6aa882a567abb00b1b94a6550586bd6df47452..0cb78c583c7ea43306794de7731ca551ece455a9 100644 (file)
--- a/drivers/pci/controller/pcie-iproc-platform.c
+++ b/drivers/pci/controller/pcie-iproc-platform.c
@@ -134,7 +134,7 @@ static struct platform_driver iproc_pltfm_pcie_driver = {
                .of_match_table = of_match_ptr(iproc_pcie_of_match_table),
        },
        .probe = iproc_pltfm_pcie_probe,
-       .remove_new = iproc_pltfm_pcie_remove,
+       .remove = iproc_pltfm_pcie_remove,
        .shutdown = iproc_pltfm_pcie_shutdown,
 };
 module_platform_driver(iproc_pltfm_pcie_driver);

diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
index 66ce4b5d309bb6d64618c70ac5e0a529e0910511..969f62e9cf01f36dddff98fe1d1a42eaefc2dc95 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -1225,7 +1225,7 @@ MODULE_DEVICE_TABLE(of, mtk_pcie_of_match);
 
 static struct platform_driver mtk_pcie_driver = {
        .probe = mtk_pcie_probe,
-       .remove_new = mtk_pcie_remove,
+       .remove = mtk_pcie_remove,
        .driver = {
                .name = "mtk-pcie-gen3",
                .of_match_table = mtk_pcie_of_match,

diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 7f7d04c2ea573f612cf585ff869228631fd9c14f..3bcfc4e58ba244740e6ee5e3d6bd20f8b2614364 100644 (file)
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -1235,7 +1235,7 @@ MODULE_DEVICE_TABLE(of, mtk_pcie_ids);
 
 static struct platform_driver mtk_pcie_driver = {
        .probe = mtk_pcie_probe,
-       .remove_new = mtk_pcie_remove,
+       .remove = mtk_pcie_remove,
        .driver = {
                .name = "mtk-pcie",
                .of_match_table = mtk_pcie_ids,

diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c
index 9b4754a45515f5ba1d240b5cc34a2c8465b42761..776caa0b10115b7a6ee3dc7a8a9c9a19541d80c7 100644 (file)
--- a/drivers/pci/controller/pcie-mt7621.c
+++ b/drivers/pci/controller/pcie-mt7621.c
@@ -541,7 +541,7 @@ MODULE_DEVICE_TABLE(of, mt7621_pcie_ids);
 
 static struct platform_driver mt7621_pcie_driver = {
        .probe = mt7621_pcie_probe,
-       .remove_new = mt7621_pcie_remove,
+       .remove = mt7621_pcie_remove,
        .driver = {
                .name = "mt7621-pci",
                .of_match_table = mt7621_pcie_ids,

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index cbec711148253a00a0a61edf1d882552d514d3a8..06cdb68f0920284d3751983a6eed4864ffdce998 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -1050,7 +1050,7 @@ static struct platform_driver rockchip_pcie_driver = {
                .pm = &rockchip_pcie_pm_ops,
        },
        .probe = rockchip_pcie_probe,
-       .remove_new = rockchip_pcie_remove,
+       .remove = rockchip_pcie_remove,
 };
 module_platform_driver(rockchip_pcie_driver);
 

diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index a8ae14474dd0a42d9286dff9fb37ab6d479591c0..8d6e2a89b067b679eec72a1433a8ba9bc160a5f9 100644 (file)
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -916,6 +916,6 @@ static struct platform_driver nwl_pcie_driver = {
                .of_match_table = nwl_pcie_of_match,
        },
        .probe = nwl_pcie_probe,
-       .remove_new = nwl_pcie_remove,
+       .remove = nwl_pcie_remove,
 };
 builtin_platform_driver(nwl_pcie_driver);

diff --git a/drivers/pci/controller/plda/pcie-starfive.c b/drivers/pci/controller/plda/pcie-starfive.c
index c9933ecf68338207e006407130c3a4d039db4465..0567ec373a3ed505d09becc4550c8be52525851c 100644 (file)
--- a/drivers/pci/controller/plda/pcie-starfive.c
+++ b/drivers/pci/controller/plda/pcie-starfive.c
@@ -480,7 +480,7 @@ static struct platform_driver starfive_pcie_driver = {
                .pm = pm_sleep_ptr(&starfive_pcie_pm_ops),
        },
        .probe = starfive_pcie_probe,
-       .remove_new = starfive_pcie_remove,
+       .remove = starfive_pcie_remove,
 };
 module_platform_driver(starfive_pcie_driver);