aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/hotplug/rpadlpar_core.c3
-rw-r--r--drivers/pci/hotplug/rpaphp_pci.c14
2 files changed, 3 insertions, 14 deletions
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index cc03609f45d0..0173641c4149 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -154,7 +154,8 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
154 struct pci_controller *phb = pdn->phb; 154 struct pci_controller *phb = pdn->phb;
155 struct pci_dev *dev = NULL; 155 struct pci_dev *dev = NULL;
156 156
157 rpaphp_eeh_init_nodes(dn); 157 eeh_add_device_tree_early(dn);
158
158 /* Add EADS device to PHB bus, adding new entry to bus->devices */ 159 /* Add EADS device to PHB bus, adding new entry to bus->devices */
159 dev = of_create_pci_dev(dn, phb->bus, pdn->devfn); 160 dev = of_create_pci_dev(dn, phb->bus, pdn->devfn);
160 if (!dev) { 161 if (!dev) {
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 4b35097b3d9f..fc2368710cf7 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -287,18 +287,6 @@ rpaphp_pci_config_slot(struct pci_bus *bus)
287 return dev; 287 return dev;
288} 288}
289 289
290void rpaphp_eeh_init_nodes(struct device_node *dn)
291{
292 struct device_node *sib;
293
294 for (sib = dn->child; sib; sib = sib->sibling)
295 rpaphp_eeh_init_nodes(sib);
296 eeh_add_device_early(dn);
297 return;
298
299}
300EXPORT_SYMBOL_GPL(rpaphp_eeh_init_nodes);
301
302static void print_slot_pci_funcs(struct pci_bus *bus) 290static void print_slot_pci_funcs(struct pci_bus *bus)
303{ 291{
304 struct device_node *dn; 292 struct device_node *dn;
@@ -324,7 +312,7 @@ int rpaphp_config_pci_adapter(struct pci_bus *bus)
324 if (!dn) 312 if (!dn)
325 goto exit; 313 goto exit;
326 314
327 rpaphp_eeh_init_nodes(dn); 315 eeh_add_device_tree_early(dn);
328 dev = rpaphp_pci_config_slot(bus); 316 dev = rpaphp_pci_config_slot(bus);
329 if (!dev) { 317 if (!dev) {
330 err("%s: can't find any devices.\n", __FUNCTION__); 318 err("%s: can't find any devices.\n", __FUNCTION__);