diff options
author | linas@austin.ibm.com <linas@austin.ibm.com> | 2006-01-12 18:26:27 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 18:00:12 -0800 |
commit | 8fe64399cccf8dddcc4e5eaff270a12064f6fe9f (patch) | |
tree | aa7d9c3b842ded5d205fc70119128e618ef657e8 /drivers/pci/hotplug/rpadlpar_core.c | |
parent | 8a85a70db8c65fd1703b4597f72fe6ee25642234 (diff) | |
download | kernel_samsung_smdk4412-8fe64399cccf8dddcc4e5eaff270a12064f6fe9f.zip kernel_samsung_smdk4412-8fe64399cccf8dddcc4e5eaff270a12064f6fe9f.tar.gz kernel_samsung_smdk4412-8fe64399cccf8dddcc4e5eaff270a12064f6fe9f.tar.bz2 |
[PATCH] powerpc/PCI hotplug: de-convolute rpaphp_unconfig_pci_adap
Remove general baroqueness. The function rpaphp_unconfig_pci_adapter()
is really just three lines of code, once all the dbg printks are removed.
And its called in only one place. So replace the call by the thre lines.
Also, provide proper semaphore locking in the affected function
disable_slot()
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/hotplug/rpadlpar_core.c')
-rw-r--r-- | drivers/pci/hotplug/rpadlpar_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index 6c14810..15e853e 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c @@ -380,7 +380,11 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn) return -EIO; } } else { - rpaphp_unconfig_pci_adapter(bus); + struct pci_dev *dev, *tmp; + list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) { + eeh_remove_bus_device(dev); + pci_remove_bus_device(dev); + } } if (unmap_bus_range(bus)) { |