The bus field in struct slot is not necessary.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
---
drivers/pci/hotplug/pciehp.h | 1 -
drivers/pci/hotplug/pciehp_core.c | 3 ++-
drivers/pci/hotplug/pciehp_ctrl.c | 6 ++++--
drivers/pci/hotplug/pciehp_hpc.c | 1 -
drivers/pci/hotplug/pciehp_pci.c | 6 ++++--
5 files changed, 10 insertions(+), 7 deletions(-)
Index: 20090915/drivers/pci/hotplug/pciehp.h
===================================================================
--- 20090915.orig/drivers/pci/hotplug/pciehp.h
+++ 20090915/drivers/pci/hotplug/pciehp.h
@@ -72,7 +72,6 @@ do { \
#define SLOT_NAME_SIZE 10
struct slot {
- u8 bus;
u8 device;
u8 state;
u8 hp_slot;
Index: 20090915/drivers/pci/hotplug/pciehp_core.c
===================================================================
--- 20090915.orig/drivers/pci/hotplug/pciehp_core.c
+++ 20090915/drivers/pci/hotplug/pciehp_core.c
@@ -126,7 +126,8 @@ static int init_slot(struct controller *
ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x "
"hp_slot=%x sun=%x slot_device_offset=%x\n",
pci_domain_nr(ctrl->pci_dev->subordinate),
- slot->bus, slot->device, slot->hp_slot, slot->number,
+ ctrl->pci_dev->subordinate->number,
+ slot->device, slot->hp_slot, slot->number,
ctrl->slot_device_offset);
retval = pci_hp_register(hotplug,
ctrl->pci_dev->subordinate,
Index: 20090915/drivers/pci/hotplug/pciehp_ctrl.c
===================================================================
--- 20090915.orig/drivers/pci/hotplug/pciehp_ctrl.c
+++ 20090915/drivers/pci/hotplug/pciehp_ctrl.c
@@ -242,7 +242,8 @@ static int board_added(struct slot *p_sl
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 w
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;
Index: 20090915/drivers/pci/hotplug/pciehp_hpc.c
===================================================================
--- 20090915.orig/drivers/pci/hotplug/pciehp_hpc.c
+++ 20090915/drivers/pci/hotplug/pciehp_hpc.c
@@ -930,7 +930,6 @@ static int pcie_init_slot(struct control
slot->hp_slot = 0;
slot->ctrl = ctrl;
- slot->bus = ctrl->pci_dev->subordinate->number;
slot->device = ctrl->slot_device_offset + slot->hp_slot;
slot->hpc_ops = ctrl->hpc_ops;
slot->number = ctrl->first_slot;
Index: 20090915/drivers/pci/hotplug/pciehp_pci.c
===================================================================
--- 20090915.orig/drivers/pci/hotplug/pciehp_pci.c
+++ 20090915/drivers/pci/hotplug/pciehp_pci.c
@@ -71,7 +71,8 @@ int pciehp_configure_device(struct 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 slo
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
