Commit 3c87b3c8 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Bjorn Helgaas
Browse files

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

After commit 0edb555a ("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: default avatarSergio 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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 9852d85e

drivers/pci/controller/cadence/pci-j721e.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/pci/controller/dwc/pci-exynos.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/pci/controller/dwc/pci-keystone.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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,