aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug/pciehp_ctrl.c
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2009-09-15 17:26:32 +0900
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-17 10:05:46 -0700
commitab9c6c86701b498445334db746aa2e8dc473c7b6 (patch)
treeebfdc650615be00a8047fb3448d96731a7197292 /drivers/pci/hotplug/pciehp_ctrl.c
parent6a11c135f3511743d09474ccaac2137d34c352a8 (diff)
PCI: pciehp: remove bus field
The bus field in struct slot is not necessary. Acked-by: Alex Chiang <achiang@hp.com> Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_ctrl.c')
-rw-r--r--drivers/pci/hotplug/pciehp_ctrl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index b97cb4c3e0f..a68069c9ba8 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -242,7 +242,8 @@ static int board_added(struct slot *p_slot)
retval = pciehp_configure_device(p_slot);
if (retval) {
ctrl_err(ctrl, "Cannot add device at %04x:%02x:%02x\n",
- pci_domain_nr(parent), p_slot->bus, p_slot->device);
+ pci_domain_nr(parent), parent->number,
+ p_slot->device);
goto err_exit;
}
@@ -319,7 +320,8 @@ static void pciehp_power_thread(struct work_struct *work)
ctrl_dbg(p_slot->ctrl,
"Disabling domain:bus:device=%04x:%02x:%02x\n",
pci_domain_nr(p_slot->ctrl->pci_dev->subordinate),
- p_slot->bus, p_slot->device);
+ p_slot->ctrl->pci_dev->subordinate->number,
+ p_slot->device);
pciehp_disable_slot(p_slot);
mutex_lock(&p_slot->lock);
p_slot->state = STATIC_STATE;