Commit 3146c8f4 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/remove' into next 

* pci/remove:
  PCI: Don't allow unbinding host controllers that aren't prepared
parents ef1b5dad a5f40e80

drivers/pci/dwc/pci-imx6.c

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ static struct platform_driver imx6_pcie_driver = { 
	.driver = {

		.name	= "imx6q-pcie",

		.of_match_table = imx6_pcie_of_match,

		.suppress_bind_attrs = true,

	},

	.probe    = imx6_pcie_probe,

	.shutdown = imx6_pcie_shutdown,

drivers/pci/dwc/pci-layerscape.c

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static struct platform_driver ls_pcie_driver = { 
	.driver = {

		.name = "layerscape-pcie",

		.of_match_table = ls_pcie_of_match,

		.suppress_bind_attrs = true,

	},

};

builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);

drivers/pci/dwc/pcie-armada8k.c

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ static struct platform_driver armada8k_pcie_driver = { 
	.driver = {

		.name	= "armada8k-pcie",

		.of_match_table = of_match_ptr(armada8k_pcie_of_match),

		.suppress_bind_attrs = true,

	},

};

builtin_platform_driver(armada8k_pcie_driver);

drivers/pci/dwc/pcie-artpec6.c

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ static struct platform_driver artpec6_pcie_driver = { 
	.driver = {

		.name	= "artpec6-pcie",

		.of_match_table = artpec6_pcie_of_match,

		.suppress_bind_attrs = true,

	},

};

builtin_platform_driver(artpec6_pcie_driver);

drivers/pci/dwc/pcie-designware-plat.c

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static struct platform_driver dw_plat_pcie_driver = { 
	.driver = {

		.name	= "dw-pcie",

		.of_match_table = dw_plat_pcie_of_match,

		.suppress_bind_attrs = true,

	},

	.probe = dw_plat_pcie_probe,

};