[PATCH 1/2] PCI Hotplug/powerpc: remove duplicated code

linas linas at austin.ibm.com
Fri Dec 2 11:56:14 EST 2005


Greg,
Please apply!

--linas

The RPAPHP code contains a routine that duplicates some existing code.
This patch removes the rpaphp version of the code.

Signed-off-by: Linas Vepstas <linas at austin.ibm.com>

Index: linux-2.6.15-rc3-mm1/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.15-rc3-mm1.orig/drivers/pci/hotplug/rpaphp_pci.c	2005-12-01 18:36:40.897900661 -0600
+++ linux-2.6.15-rc3-mm1/drivers/pci/hotplug/rpaphp_pci.c	2005-12-01 18:51:18.686712139 -0600
@@ -287,18 +287,6 @@
 	return dev;
 }
 
-void rpaphp_eeh_init_nodes(struct device_node *dn)
-{
-	struct device_node *sib;
-
-	for (sib = dn->child; sib; sib = sib->sibling) 
-		rpaphp_eeh_init_nodes(sib);
-	eeh_add_device_early(dn);
-	return;
-	
-}
-EXPORT_SYMBOL_GPL(rpaphp_eeh_init_nodes);
-
 static void print_slot_pci_funcs(struct pci_bus *bus)
 {
 	struct device_node *dn;
@@ -324,7 +312,7 @@
 	if (!dn)
 		goto exit;
 
-	rpaphp_eeh_init_nodes(dn);
+	eeh_add_device_tree_early(dn);
 	dev = rpaphp_pci_config_slot(bus);
 	if (!dev) {
 		err("%s: can't find any devices.\n", __FUNCTION__);
Index: linux-2.6.15-rc3-mm1/drivers/pci/hotplug/rpadlpar_core.c
===================================================================
--- linux-2.6.15-rc3-mm1.orig/drivers/pci/hotplug/rpadlpar_core.c	2005-12-01 18:36:40.898900520 -0600
+++ linux-2.6.15-rc3-mm1/drivers/pci/hotplug/rpadlpar_core.c	2005-12-01 18:51:18.687711999 -0600
@@ -154,7 +154,8 @@
 	struct pci_controller *phb = pdn->phb;
 	struct pci_dev *dev = NULL;
 
-	rpaphp_eeh_init_nodes(dn);
+	eeh_add_device_tree_early(dn);
+
 	/* Add EADS device to PHB bus, adding new entry to bus->devices */
 	dev = of_create_pci_dev(dn, phb->bus, pdn->devfn);
 	if (!dev) {



More information about the Linuxppc64-dev mailing list