diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2009-09-15 04:26:32 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-17 13:05:46 -0400 |
commit | ab9c6c86701b498445334db746aa2e8dc473c7b6 (patch) | |
tree | ebfdc650615be00a8047fb3448d96731a7197292 /drivers/pci/hotplug/pciehp_ctrl.c | |
parent | 6a11c135f3511743d09474ccaac2137d34c352a8 (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.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index b97cb4c3e0fe..a68069c9ba8d 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) | |||
242 | retval = pciehp_configure_device(p_slot); | 242 | retval = pciehp_configure_device(p_slot); |
243 | if (retval) { | 243 | if (retval) { |
244 | ctrl_err(ctrl, "Cannot add device at %04x:%02x:%02x\n", | 244 | ctrl_err(ctrl, "Cannot add device at %04x:%02x:%02x\n", |
245 | pci_domain_nr(parent), p_slot->bus, p_slot->device); | 245 | pci_domain_nr(parent), parent->number, |
246 | p_slot->device); | ||
246 | goto err_exit; | 247 | goto err_exit; |
247 | } | 248 | } |
248 | 249 | ||
@@ -319,7 +320,8 @@ static void pciehp_power_thread(struct work_struct *work) | |||
319 | ctrl_dbg(p_slot->ctrl, | 320 | ctrl_dbg(p_slot->ctrl, |
320 | "Disabling domain:bus:device=%04x:%02x:%02x\n", | 321 | "Disabling domain:bus:device=%04x:%02x:%02x\n", |
321 | pci_domain_nr(p_slot->ctrl->pci_dev->subordinate), | 322 | pci_domain_nr(p_slot->ctrl->pci_dev->subordinate), |
322 | p_slot->bus, p_slot->device); | 323 | p_slot->ctrl->pci_dev->subordinate->number, |
324 | p_slot->device); | ||
323 | pciehp_disable_slot(p_slot); | 325 | pciehp_disable_slot(p_slot); |
324 | mutex_lock(&p_slot->lock); | 326 | mutex_lock(&p_slot->lock); |
325 | p_slot->state = STATIC_STATE; | 327 | p_slot->state = STATIC_STATE; |