kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] powerpc/PCI hotplug: merge config_pci_adapter

Browse source 
Remove general baroqueness.  The function rpaphp_config_pci_adapter()
is really just one line of code, once all the dbg printks are removed.
And its called in only one place. So replace the call by the one line.

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>
This commit is contained in:
linas@austin.ibm.com 2006-01-12 18:22:07 -06:00 committed by Greg Kroah-Hartman
parent eca845c718
commit 7fec77e479
2 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/pci/hotplug/rpaphp.h
View file

@ -92,7 +92,6 @@ extern int rpaphp_enable_pci_slot(struct slot *slot);
extern int register_pci_slot(struct slot *slot); extern int register_pci_slot(struct slot *slot);
extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value); extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
extern int rpaphp_config_pci_adapter(struct pci_bus *bus);
extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus); extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);
/* rpaphp_core.c */ /* rpaphp_core.c */

35
drivers/pci/hotplug/rpaphp_pci.c
View file

@ -116,24 +116,6 @@ static void print_slot_pci_funcs(struct pci_bus *bus)
return; return;
} }
int rpaphp_config_pci_adapter(struct pci_bus *bus)
{
struct device_node *dn = pci_bus_to_OF_node(bus);
int rc = -ENODEV;
dbg("Entry %s: slot[%s]\n", __FUNCTION__, dn->full_name);
if (!dn)
goto exit;
pcibios_add_pci_devices(bus);
print_slot_pci_funcs(bus);
rc = 0;
exit:
dbg("Exit %s: rc=%d\n", __FUNCTION__, rc);
return rc;
}
EXPORT_SYMBOL_GPL(rpaphp_config_pci_adapter);
static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev) static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)
{ {
eeh_remove_device(dev); eeh_remove_device(dev);
@ -225,10 +207,7 @@ static int setup_pci_slot(struct slot *slot)
if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) { if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
dbg("%s CONFIGURING pci adapter in slot[%s]\n", dbg("%s CONFIGURING pci adapter in slot[%s]\n",
__FUNCTION__, slot->name); __FUNCTION__, slot->name);
if (rpaphp_config_pci_adapter(slot->bus)) { pcibios_add_pci_devices(slot->bus);
err("%s: CONFIG pci adapter failed\n", __FUNCTION__);
goto exit_rc;
}
} else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) { } else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) {
err("%s: slot[%s]'s adapter_status is NOT_VALID.\n", err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
@ -274,16 +253,10 @@ int rpaphp_enable_pci_slot(struct slot *slot)
/* if slot is not empty, enable the adapter */ /* if slot is not empty, enable the adapter */
if (state == PRESENT) { if (state == PRESENT) {
dbg("%s : slot[%s] is occupied.\n", __FUNCTION__, slot->name); dbg("%s : slot[%s] is occupied.\n", __FUNCTION__, slot->name);
retval = rpaphp_config_pci_adapter(slot->bus); pcibios_add_pci_devices(slot->bus);
if (!retval) { slot->state = CONFIGURED;
slot->state = CONFIGURED; info("%s: devices in slot[%s] configured\n",
info("%s: devices in slot[%s] configured\n",
__FUNCTION__, slot->name); __FUNCTION__, slot->name);
} else {
slot->state = NOT_CONFIGURED;
dbg("%s: no pci_dev struct for adapter in slot[%s]\n",
__FUNCTION__, slot->name);
}
} else if (state == EMPTY) { } else if (state == EMPTY) {
dbg("%s : slot[%s] is empty\n", __FUNCTION__, slot->name); dbg("%s : slot[%s] is empty\n", __FUNCTION__, slot->name);
slot->state = EMPTY; slot->state = EMPTY;