[PATCH] powerpc/PCI hotplug: remove remove_bus_device()
authorlinas@austin.ibm.com <linas@austin.ibm.com>
Fri, 13 Jan 2006 00:24:27 +0000 (18:24 -0600)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 1 Feb 2006 02:00:12 +0000 (18:00 -0800)
The function rpaphp_eeh_remove_bus_device() is a dupe of
eeh_remove_bus_device(). Remove it.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Acked-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pci/hotplug/rpaphp_pci.c

index b93d9c964eea68725b8156cf6e1d252591aac090..1f5e73be47c74c877b9f2cb143e03d1fb7061dce 100644 (file)
@@ -116,30 +116,12 @@ static void print_slot_pci_funcs(struct pci_bus *bus)
        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;