Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53370
b: refs/heads/master
c: 307ff12
h: refs/heads/master
v: v3
  • Loading branch information
Linas Vepstas authored and Greg Kroah-Hartman committed May 3, 2007
1 parent cb31caf commit 87e78d7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 03a667559138d47cea487823332c4712fc6fbec7
refs/heads/master: 307ff12e35526cfab9f09cafcb17239286e6eb85
23 changes: 7 additions & 16 deletions trunk/drivers/pci/hotplug/rpaphp_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,6 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state)
return rc;
}

static void print_slot_pci_funcs(struct pci_bus *bus)
{
struct device_node *dn;
struct pci_dev *dev;

dn = pci_bus_to_OF_node(bus);
if (!dn)
return;

dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, dn->full_name);
list_for_each_entry (dev, &bus->devices, bus_list)
dbg("\t%s\n", pci_name(dev));
return;
}

static void set_slot_name(struct slot *slot)
{
struct pci_bus *bus = slot->bus;
Expand Down Expand Up @@ -138,11 +123,17 @@ int rpaphp_register_pci_slot(struct slot *slot)
if (list_empty(&bus->devices))
pcibios_add_pci_devices(bus);

print_slot_pci_funcs(bus);
if (!list_empty(&bus->devices)) {
info->adapter_status = CONFIGURED;
slot->state = CONFIGURED;
}

if (debug) {
struct pci_dev *dev;
dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, slot->dn->full_name);
list_for_each_entry (dev, &bus->devices, bus_list)
dbg("\t%s\n", pci_name(dev));
}
}

return rpaphp_register_slot(slot);
Expand Down

0 comments on commit 87e78d7

Please sign in to comment.