Browse Source

Merge branch 'pci/remove' into next

* pci/remove:
  PCI: Don't allow unbinding host controllers that aren't prepared
Bjorn Helgaas 8 years ago
parent
commit
3146c8f4de

+ 1 - 0
drivers/pci/dwc/pci-imx6.c

@@ -804,6 +804,7 @@ static struct platform_driver imx6_pcie_driver = {
 	.driver = {
 	.driver = {
 		.name	= "imx6q-pcie",
 		.name	= "imx6q-pcie",
 		.of_match_table = imx6_pcie_of_match,
 		.of_match_table = imx6_pcie_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe    = imx6_pcie_probe,
 	.probe    = imx6_pcie_probe,
 	.shutdown = imx6_pcie_shutdown,
 	.shutdown = imx6_pcie_shutdown,

+ 1 - 0
drivers/pci/dwc/pci-layerscape.c

@@ -305,6 +305,7 @@ static struct platform_driver ls_pcie_driver = {
 	.driver = {
 	.driver = {
 		.name = "layerscape-pcie",
 		.name = "layerscape-pcie",
 		.of_match_table = ls_pcie_of_match,
 		.of_match_table = ls_pcie_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 };
 };
 builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);
 builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);

+ 1 - 0
drivers/pci/dwc/pcie-armada8k.c

@@ -262,6 +262,7 @@ static struct platform_driver armada8k_pcie_driver = {
 	.driver = {
 	.driver = {
 		.name	= "armada8k-pcie",
 		.name	= "armada8k-pcie",
 		.of_match_table = of_match_ptr(armada8k_pcie_of_match),
 		.of_match_table = of_match_ptr(armada8k_pcie_of_match),
+		.suppress_bind_attrs = true,
 	},
 	},
 };
 };
 builtin_platform_driver(armada8k_pcie_driver);
 builtin_platform_driver(armada8k_pcie_driver);

+ 1 - 0
drivers/pci/dwc/pcie-artpec6.c

@@ -295,6 +295,7 @@ static struct platform_driver artpec6_pcie_driver = {
 	.driver = {
 	.driver = {
 		.name	= "artpec6-pcie",
 		.name	= "artpec6-pcie",
 		.of_match_table = artpec6_pcie_of_match,
 		.of_match_table = artpec6_pcie_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 };
 };
 builtin_platform_driver(artpec6_pcie_driver);
 builtin_platform_driver(artpec6_pcie_driver);

+ 1 - 0
drivers/pci/dwc/pcie-designware-plat.c

@@ -133,6 +133,7 @@ static struct platform_driver dw_plat_pcie_driver = {
 	.driver = {
 	.driver = {
 		.name	= "dw-pcie",
 		.name	= "dw-pcie",
 		.of_match_table = dw_plat_pcie_of_match,
 		.of_match_table = dw_plat_pcie_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe = dw_plat_pcie_probe,
 	.probe = dw_plat_pcie_probe,
 };
 };

+ 2 - 0
drivers/pci/dwc/pcie-hisi.c

@@ -333,6 +333,7 @@ static struct platform_driver hisi_pcie_driver = {
 	.driver = {
 	.driver = {
 		   .name = "hisi-pcie",
 		   .name = "hisi-pcie",
 		   .of_match_table = hisi_pcie_of_match,
 		   .of_match_table = hisi_pcie_of_match,
+		   .suppress_bind_attrs = true,
 	},
 	},
 };
 };
 builtin_platform_driver(hisi_pcie_driver);
 builtin_platform_driver(hisi_pcie_driver);
@@ -390,6 +391,7 @@ static struct platform_driver hisi_pcie_almost_ecam_driver = {
 	.driver = {
 	.driver = {
 		   .name = "hisi-pcie-almost-ecam",
 		   .name = "hisi-pcie-almost-ecam",
 		   .of_match_table = hisi_pcie_almost_ecam_of_match,
 		   .of_match_table = hisi_pcie_almost_ecam_of_match,
+		   .suppress_bind_attrs = true,
 	},
 	},
 };
 };
 builtin_platform_driver(hisi_pcie_almost_ecam_driver);
 builtin_platform_driver(hisi_pcie_almost_ecam_driver);

+ 1 - 0
drivers/pci/dwc/pcie-spear13xx.c

@@ -308,6 +308,7 @@ static struct platform_driver spear13xx_pcie_driver = {
 	.driver = {
 	.driver = {
 		.name	= "spear-pcie",
 		.name	= "spear-pcie",
 		.of_match_table = of_match_ptr(spear13xx_pcie_of_match),
 		.of_match_table = of_match_ptr(spear13xx_pcie_of_match),
+		.suppress_bind_attrs = true,
 	},
 	},
 };
 };
 
 

+ 1 - 0
drivers/pci/host/pci-ftpci100.c

@@ -556,6 +556,7 @@ static struct platform_driver faraday_pci_driver = {
 	.driver = {
 	.driver = {
 		.name = "ftpci100",
 		.name = "ftpci100",
 		.of_match_table = of_match_ptr(faraday_pci_of_match),
 		.of_match_table = of_match_ptr(faraday_pci_of_match),
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe  = faraday_pci_probe,
 	.probe  = faraday_pci_probe,
 };
 };

+ 1 - 0
drivers/pci/host/pci-host-generic.c

@@ -60,6 +60,7 @@ static struct platform_driver gen_pci_driver = {
 	.driver = {
 	.driver = {
 		.name = "pci-host-generic",
 		.name = "pci-host-generic",
 		.of_match_table = gen_pci_of_match,
 		.of_match_table = gen_pci_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe = gen_pci_probe,
 	.probe = gen_pci_probe,
 };
 };

+ 1 - 0
drivers/pci/host/pci-thunder-ecam.c

@@ -373,6 +373,7 @@ static struct platform_driver thunder_ecam_driver = {
 	.driver = {
 	.driver = {
 		.name = KBUILD_MODNAME,
 		.name = KBUILD_MODNAME,
 		.of_match_table = thunder_ecam_of_match,
 		.of_match_table = thunder_ecam_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe = thunder_ecam_probe,
 	.probe = thunder_ecam_probe,
 };
 };

+ 1 - 0
drivers/pci/host/pci-thunder-pem.c

@@ -474,6 +474,7 @@ static struct platform_driver thunder_pem_driver = {
 	.driver = {
 	.driver = {
 		.name = KBUILD_MODNAME,
 		.name = KBUILD_MODNAME,
 		.of_match_table = thunder_pem_of_match,
 		.of_match_table = thunder_pem_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe = thunder_pem_probe,
 	.probe = thunder_pem_probe,
 };
 };

+ 1 - 0
drivers/pci/host/pci-versatile.c

@@ -222,6 +222,7 @@ static struct platform_driver versatile_pci_driver = {
 	.driver = {
 	.driver = {
 		.name = "versatile-pci",
 		.name = "versatile-pci",
 		.of_match_table = versatile_pci_of_match,
 		.of_match_table = versatile_pci_of_match,
+		.suppress_bind_attrs = true,
 	},
 	},
 	.probe = versatile_pci_probe,
 	.probe = versatile_pci_probe,
 };
 };

+ 1 - 0
drivers/pci/host/pci-xgene.c

@@ -697,6 +697,7 @@ static struct platform_driver xgene_pcie_driver = {
 	.driver = {
 	.driver = {
 		   .name = "xgene-pcie",
 		   .name = "xgene-pcie",
 		   .of_match_table = of_match_ptr(xgene_pcie_match_table),
 		   .of_match_table = of_match_ptr(xgene_pcie_match_table),
+		   .suppress_bind_attrs = true,
 	},
 	},
 	.probe = xgene_pcie_probe_bridge,
 	.probe = xgene_pcie_probe_bridge,
 };
 };