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>

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index cfd2f59b61009ca98939a43c69963df063c7bdda..44df330c14884ccd734e74e26f5950ca68d0b357 100644 (file)
--- a/drivers/pci/hotplug/pciehp.h
+++ b/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;

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index d2cec882a2f51afa8bc7d49ed17792056d8f1010..3164d0e7903b85933c005d7fc0369f2244396958 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -126,7 +126,8 @@ static int init_slot(struct controller *ctrl)
        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,

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index b97cb4c3e0fe13258de0ce801aff6bf81c512c6a..a68069c9ba8d1a6f2d06c3eb23a2e3bf275c99f0 100644 (file)
--- 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;

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index d573338af1a4ff90b1d01de7b7212a15ade18d44..aec1d663f6231ce38fe1b40ca86bca692193d920 100644 (file)
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -930,7 +930,6 @@ static int pcie_init_slot(struct controller *ctrl)
 
        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;

diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 02e24d63b3eec78fcdb67c1274d64c6fda953640..2e5f6b816da6498cb9535d4d1722fb8dafc0d975 100644 (file)
--- 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;