From 1fc6c35767e40eda68d871c650ff23f8d215801d Mon Sep 17 00:00:00 2001 From: "linas@austin.ibm.com" Date: Thu, 12 Jan 2006 18:24:27 -0600 Subject: [PATCH] --- yaml --- r: 19254 b: refs/heads/master c: 8a85a70db8c65fd1703b4597f72fe6ee25642234 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/rpaphp_pci.c | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 4e3d46246346..4ebcf278e80a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fec77e4793f307b30846a3d4015d329ffc0b685 +refs/heads/master: 8a85a70db8c65fd1703b4597f72fe6ee25642234 diff --git a/trunk/drivers/pci/hotplug/rpaphp_pci.c b/trunk/drivers/pci/hotplug/rpaphp_pci.c index b93d9c964eea..1f5e73be47c7 100644 --- a/trunk/drivers/pci/hotplug/rpaphp_pci.c +++ b/trunk/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;