diff options
author | linas <linas@austin.ibm.com> | 2005-09-28 20:33:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 18:36:59 -0400 |
commit | 934199e95d6ac28f42686fe3009877eff33e06c3 (patch) | |
tree | 607f305d0a7841484bd7b1e1adf956c7231db2de /drivers/pci/hotplug/rpaphp_core.c | |
parent | b7924c38c9a9c6151213bc0d91776eace614e761 (diff) |
[PATCH] ppc64 PCI Hotplug: cleanup unsymmetric API routines
This is a minor patch to the ppc64 PCI hotplug code; it makes the call to
rpaphp_unconfig_pci_adapter() symmetric with respect to the call to
rpaphp_config_pci_adapter(). I discussed this with John Rose, who
had provided the last round of changes for these functions; he
appearently had this patch but somehow failed to mail it out.
Tested. (added/removed device).
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
drivers/pci/hotplug/rpaphp.h | 3 ++-
drivers/pci/hotplug/rpaphp_core.c | 5 ++++-
drivers/pci/hotplug/rpaphp_pci.c | 11 +++--------
3 files changed, 9 insertions(+), 10 deletions(-)
Diffstat (limited to 'drivers/pci/hotplug/rpaphp_core.c')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index c830ff0acdc..cf075c34b57 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c | |||
@@ -426,8 +426,11 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) | |||
426 | 426 | ||
427 | dbg("DISABLING SLOT %s\n", slot->name); | 427 | dbg("DISABLING SLOT %s\n", slot->name); |
428 | down(&rpaphp_sem); | 428 | down(&rpaphp_sem); |
429 | retval = rpaphp_unconfig_pci_adapter(slot); | 429 | retval = rpaphp_unconfig_pci_adapter(slot->bus); |
430 | up(&rpaphp_sem); | 430 | up(&rpaphp_sem); |
431 | slot->state = NOT_CONFIGURED; | ||
432 | info("%s: devices in slot[%s] unconfigured.\n", __FUNCTION__, | ||
433 | slot->name); | ||
431 | exit: | 434 | exit: |
432 | dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval); | 435 | dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval); |
433 | return retval; | 436 | return retval; |