4 files changed, 4 insertions, 12 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index d69a96cd9681..382c939ef7ae 100644
--- 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;
-        u8 hp_slot;
         u32 number;
         struct controller *ctrl;
         struct hpc_ops *hpc_ops;
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index cc3a852e38bd..3adca3cb502a 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -124,10 +124,10 @@ static int init_slot(struct controller *ctrl)
         snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
 
         ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:00 "
-                 "hp_slot=%x sun=%x slot_device_offset=%x\n",
+                 "sun=%x slot_device_offset=%x\n",
                  pci_domain_nr(ctrl->pci_dev->subordinate),
                  ctrl->pci_dev->subordinate->number,
-                 slot->hp_slot, slot->number, ctrl->slot_device_offset);
+                 slot->number, ctrl->slot_device_offset);
         retval = pci_hp_register(hotplug,
                                  ctrl->pci_dev->subordinate, 0, name);
         if (retval) {
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 7e31728d8ca4..1b5e476a48b9 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -210,8 +210,8 @@ static int board_added(struct slot *p_slot)
         struct controller *ctrl = p_slot->ctrl;
         struct pci_bus *parent = ctrl->pci_dev->subordinate;
 
-        ctrl_dbg(ctrl, "%s: slot device, slot offset, hp slot = 0, %d, %d\n",
-                 __func__, ctrl->slot_device_offset, p_slot->hp_slot);
+        ctrl_dbg(ctrl, "%s: slot device, slot offset = 0, %d\n",
+                 __func__, ctrl->slot_device_offset);
 
         if (POWER_CTRL(ctrl)) {
                 /* Power on slot */
@@ -268,8 +268,6 @@ static int remove_board(struct slot *p_slot)
         if (retval)
                 return retval;
 
-        ctrl_dbg(ctrl, "%s: hp_slot = %d\n", __func__, p_slot->hp_slot);
-
         if (POWER_CTRL(ctrl)) {
                 /* power off slot */
                 retval = p_slot->hpc_ops->power_off_slot(p_slot);
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index bbbed34bce78..24b221572f07 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -497,8 +497,6 @@ static int hpc_power_on_slot(struct slot * slot)
         u16 slot_status;
         int retval = 0;
 
-        ctrl_dbg(ctrl, "%s: slot->hp_slot %x\n", __func__, slot->hp_slot);
-
         /* Clear sticky power-fault bit from previous power failures */
         retval = pciehp_readw(ctrl, PCI_EXP_SLTSTA, &slot_status);
         if (retval) {
@@ -578,8 +576,6 @@ static int hpc_power_off_slot(struct slot * slot)
         int retval = 0;
         int changed;
 
-        ctrl_dbg(ctrl, "%s: slot->hp_slot %x\n", __func__, slot->hp_slot);
-
         /*
          * Set Bad DLLP Mask bit in Correctable Error Mask
          * Register. This is the workaround against Bad DLLP error
@@ -928,7 +924,6 @@ static int pcie_init_slot(struct controller *ctrl)
         if (!slot)
                 return -ENOMEM;
 
-        slot->hp_slot = 0;
         slot->ctrl = ctrl;
         slot->hpc_ops = ctrl->hpc_ops;
         slot->number = ctrl->first_slot;