diff options
| author | Kenji Kaneshige | 2009-09-15 10:26:32 +0200 |
|---|---|---|
| committer | Jesse Barnes | 2009-09-17 19:05:46 +0200 |
| commit | ab9c6c86701b498445334db746aa2e8dc473c7b6 (patch) | |
| tree | ebfdc650615be00a8047fb3448d96731a7197292 /drivers/pci/hotplug/pciehp_pci.c | |
| parent | PCI: pciehp: remove slot_num_inc field (diff) | |
| download | kernel-qcow2-linux-ab9c6c86701b498445334db746aa2e8dc473c7b6.tar.gz kernel-qcow2-linux-ab9c6c86701b498445334db746aa2e8dc473c7b6.tar.xz kernel-qcow2-linux-ab9c6c86701b498445334db746aa2e8dc473c7b6.zip | |
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_pci.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_pci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index 02e24d63b3ee..2e5f6b816da6 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c @@ -71,7 +71,8 @@ int pciehp_configure_device(struct slot *p_slot) if (dev) { ctrl_err(ctrl, "Device %s already exists " "at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev), - pci_domain_nr(parent), p_slot->bus, p_slot->device); + pci_domain_nr(parent), parent->number, + p_slot->device); pci_dev_put(dev); return -EINVAL; } @@ -116,7 +117,8 @@ int pciehp_unconfigure_device(struct slot *p_slot) struct controller *ctrl = p_slot->ctrl; ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n", - __func__, pci_domain_nr(parent), p_slot->bus, p_slot->device); + __func__, pci_domain_nr(parent), parent->number, + p_slot->device); ret = p_slot->hpc_ops->get_adapter_status(p_slot, &presence); if (ret) presence = 0; |