diff options
| author |   linas@austin.ibm.com <linas@austin.ibm.com> | 2006-01-12 18:24:27 -0600 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 18:00:12 -0800 |
| commit | 8a85a70db8c65fd1703b4597f72fe6ee25642234 (patch) | |
| tree | 830db880e28f5109e2eafd754678e57537a1e822 /drivers/pci | |
| parent | [PATCH] powerpc/PCI hotplug: merge config_pci_adapter (diff) | |
| download | linux-dev-8a85a70db8c65fd1703b4597f72fe6ee25642234.tar.xz linux-dev-8a85a70db8c65fd1703b4597f72fe6ee25642234.zip | |
[PATCH] powerpc/PCI hotplug: remove remove_bus_device()
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>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/rpaphp_pci.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c index b93d9c964eea..1f5e73be47c7 100644 --- a/drivers/pci/hotplug/rpaphp_pci.c +++ b/drivers/pci/hotplug/rpaphp_pci.c @@ -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; |