[PATCH 5/9] powerpc/PCI hotplug: remove remove_bus_device()

linas linas at austin.ibm.com
Wed Dec 14 06:53:55 EST 2005


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

--linas

The function rpaphp_eeh_remove_bus_device() is a dupe of 
eeh_remove_bus_device(). Remove it.

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:33:32.646407144 -0600
+++ linux-2.6.15-rc5-mm2/drivers/pci/hotplug/rpaphp_pci.c	2005-12-12 15:34:35.763531664 -0600
@@ -116,30 +116,12 @@
 	return;
 }
 
-static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)
-{
-	eeh_remove_device(dev);
-	if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-		struct pci_bus *bus = dev->subordinate;
-		struct list_head *ln;
-		if (!bus)
-			return; 
-		for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
-			struct pci_dev *pdev = pci_dev_b(ln);
-			if (pdev)
-				rpaphp_eeh_remove_bus_device(pdev);
-		}
-
-	}
-	return;
-}
-
 int rpaphp_unconfig_pci_adapter(struct pci_bus *bus)
 {
 	struct pci_dev *dev, *tmp;
 
 	list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
-		rpaphp_eeh_remove_bus_device(dev);
+		eeh_remove_bus_device(dev);
 		pci_remove_bus_device(dev);
 	}
 	return 0;



More information about the Linuxppc64-dev mailing list