Commit dd976123 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/driver-remove' 

- Convert driver .remove_new() callbacks to .remove() again to finish the
  conversion from returning 'int' to being 'void' (Sergio Paracuellos)

* pci/driver-remove:
  PCI: acpiphp_ampere_altra: Switch back to struct platform_driver::remove()
  PCI: controller: Switch back to struct platform_driver::remove()
parents f326ce16 43d6961c

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,