PCI: pciehp: remove number field

Since slot_cap field in struct controller contains physical slot
number informationq, we don't need number field in struct slot.

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 b7054cb885cf6699d30c4c4b45f90227b72d3649..b20a38da7a8036ceab9e3fa6c8a19f8ee34d899c 100644 (file)
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -73,7 +73,6 @@ do {                                                                  \
 #define SLOT_NAME_SIZE 10
 struct slot {
        u8 state;
-       u32 number;
        struct controller *ctrl;
        struct hotplug_slot *hotplug_slot;
        struct delayed_work work;       /* work for button event */

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 2c6d94fcf9aa60588c81154547b3bbdbd2b55143..bc234719b1df7208f8f12003fe3f99b8997cb0ee 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -121,11 +121,11 @@ static int init_slot(struct controller *ctrl)
        hotplug->release = &release_slot;
        hotplug->ops = &pciehp_hotplug_slot_ops;
        slot->hotplug_slot = hotplug;
-       snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
+       snprintf(name, SLOT_NAME_SIZE, "%u", PSN(ctrl));
 
        ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:00 sun=%x\n",
                 pci_domain_nr(ctrl->pcie->port->subordinate),
-                ctrl->pcie->port->subordinate->number, slot->number);
+                ctrl->pcie->port->subordinate->number, PSN(ctrl));
        retval = pci_hp_register(hotplug,
                                 ctrl->pcie->port->subordinate, 0, name);
        if (retval) {

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 8c34e84fc0c715ae74751dbfdb90299cfa118c37..9ef4605c1ef6471fa6beddd55ccdb4465a2d7952 100644 (file)
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -901,7 +901,6 @@ static int pcie_init_slot(struct controller *ctrl)
                return -ENOMEM;
 
        slot->ctrl = ctrl;
-       slot->number = PSN(ctrl);
        mutex_init(&slot->lock);
        INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
        ctrl->slot = slot;