[PATCH 4/9] powerpc/PCI hotplug: merge config_pci_adapter

linas linas at austin.ibm.com
Wed Dec 14 06:51:44 EST 2005



John Rose,
Please review and sign off, and forward to Greg KH!

--linas

Remove general baroqueness.  The function rpaphp_config_pci_adapter()
is really just one line of code, once all the dbg printks are removed.
And its called in only one place. So replace the call by the one line.

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


Index: linux-2.6.15-rc5-mm2/drivers/pci/hotplug/rpaphp_pci.c
===================================================================
--- linux-2.6.15-rc5-mm2.orig/drivers/pci/hotplug/rpaphp_pci.c	2005-12-12 15:30:46.720738713 -0600
+++ linux-2.6.15-rc5-mm2/drivers/pci/hotplug/rpaphp_pci.c	2005-12-12 15:33:32.646407144 -0600
@@ -116,24 +116,6 @@
 	return;
 }
 
-int rpaphp_config_pci_adapter(struct pci_bus *bus)
-{
-	struct device_node *dn = pci_bus_to_OF_node(bus);
-	int rc = -ENODEV;
-
-	dbg("Entry %s: slot[%s]\n", __FUNCTION__, dn->full_name);
-	if (!dn)
-		goto exit;
-
-	pcibios_add_pci_devices(bus);
-	print_slot_pci_funcs(bus);
-	rc = 0;
-exit:
-	dbg("Exit %s:  rc=%d\n", __FUNCTION__, rc);
-	return rc;
-}
-EXPORT_SYMBOL_GPL(rpaphp_config_pci_adapter);
-
 static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)
 {
 	eeh_remove_device(dev);
@@ -224,11 +206,8 @@
 		if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
 			dbg("%s CONFIGURING pci adapter in slot[%s]\n",  
 				__FUNCTION__, slot->name);
-			if (rpaphp_config_pci_adapter(slot->bus)) {
-				err("%s: CONFIG pci adapter failed\n", __FUNCTION__);
-				goto exit_rc;		
-			}
-
+			pcibios_add_pci_devices(slot->bus);
+			
 		} else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) {
 			err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
 				__FUNCTION__, slot->name);
@@ -273,16 +252,10 @@
 	/* if slot is not empty, enable the adapter */
 	if (state == PRESENT) {
 		dbg("%s : slot[%s] is occupied.\n", __FUNCTION__, slot->name);
-		retval = rpaphp_config_pci_adapter(slot->bus);
-		if (!retval) {
-			slot->state = CONFIGURED;
-			info("%s: devices in slot[%s] configured\n",
+		pcibios_add_pci_devices(slot->bus);
+		slot->state = CONFIGURED;
+		info("%s: devices in slot[%s] configured\n",
 					__FUNCTION__, slot->name);
-		} else {
-			slot->state = NOT_CONFIGURED;
-			dbg("%s: no pci_dev struct for adapter in slot[%s]\n",
-			    __FUNCTION__, slot->name);
-		}
 	} else if (state == EMPTY) {
 		dbg("%s : slot[%s] is empty\n", __FUNCTION__, slot->name);
 		slot->state = EMPTY;
Index: linux-2.6.15-rc5-mm2/drivers/pci/hotplug/rpaphp.h
===================================================================
--- linux-2.6.15-rc5-mm2.orig/drivers/pci/hotplug/rpaphp.h	2005-12-12 15:33:30.472712804 -0600
+++ linux-2.6.15-rc5-mm2/drivers/pci/hotplug/rpaphp.h	2005-12-12 15:33:52.278646492 -0600
@@ -92,7 +92,6 @@
 extern int register_pci_slot(struct slot *slot);
 extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
 
-extern int rpaphp_config_pci_adapter(struct pci_bus *bus);
 extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);
 
 /* rpaphp_core.c */



More information about the Linuxppc64-dev mailing list