aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2007-04-13 18:34:17 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-05-02 22:02:39 -0400
commit307ff12e35526cfab9f09cafcb17239286e6eb85 (patch)
tree58209951911e731d89de8d9a1616a7ba3b80dcd5 /drivers/pci
parent03a667559138d47cea487823332c4712fc6fbec7 (diff)
PCI: rpaphp: remove print_slot_pci_funcs()
The debug function print_slot_pci_funcs() is a large wrapper around two debug print statements. Just invoke these directly. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Cc: John Rose <johnrose@austin.ibm.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/rpaphp_pci.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 6417b7074ed4..6271be8b155e 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -64,21 +64,6 @@ int rpaphp_get_sensor_state(struct slot *slot, int *state)
64 return rc; 64 return rc;
65} 65}
66 66
67static void print_slot_pci_funcs(struct pci_bus *bus)
68{
69 struct device_node *dn;
70 struct pci_dev *dev;
71
72 dn = pci_bus_to_OF_node(bus);
73 if (!dn)
74 return;
75
76 dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, dn->full_name);
77 list_for_each_entry (dev, &bus->devices, bus_list)
78 dbg("\t%s\n", pci_name(dev));
79 return;
80}
81
82static void set_slot_name(struct slot *slot) 67static void set_slot_name(struct slot *slot)
83{ 68{
84 struct pci_bus *bus = slot->bus; 69 struct pci_bus *bus = slot->bus;
@@ -138,11 +123,17 @@ int rpaphp_register_pci_slot(struct slot *slot)
138 if (list_empty(&bus->devices)) 123 if (list_empty(&bus->devices))
139 pcibios_add_pci_devices(bus); 124 pcibios_add_pci_devices(bus);
140 125
141 print_slot_pci_funcs(bus);
142 if (!list_empty(&bus->devices)) { 126 if (!list_empty(&bus->devices)) {
143 info->adapter_status = CONFIGURED; 127 info->adapter_status = CONFIGURED;
144 slot->state = CONFIGURED; 128 slot->state = CONFIGURED;
145 } 129 }
130
131 if (debug) {
132 struct pci_dev *dev;
133 dbg("%s: pci_devs of slot[%s]\n", __FUNCTION__, slot->dn->full_name);
134 list_for_each_entry (dev, &bus->devices, bus_list)
135 dbg("\t%s\n", pci_name(dev));
136 }
146 } 137 }
147 138
148 return rpaphp_register_slot(slot); 139 return rpaphp_register_slot(slot);