1 files changed, 2 insertions, 25 deletions

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index f1e0966cee95..b23061c56115 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -37,8 +37,6 @@
 #include "pciehp.h"
 
 static void interrupt_event_handler(struct work_struct *work);
-static int pciehp_enable_slot(struct slot *p_slot);
-static int pciehp_disable_slot(struct slot *p_slot);
 
 static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
 {
@@ -197,12 +195,6 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
                             __FUNCTION__);
                         return;
                 }
-                /*
-                 * After turning power off, we must wait for at least
-                 * 1 second before taking any action that relies on
-                 * power having been removed from the slot/adapter.
-                 */
-                msleep(1000);
         }
 }
 
@@ -215,15 +207,12 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
  */
 static int board_added(struct slot *p_slot)
 {
-        u8 hp_slot;
         int retval = 0;
         struct controller *ctrl = p_slot->ctrl;
 
-        hp_slot = p_slot->device - ctrl->slot_device_offset;
-
         dbg("%s: slot device, slot offset, hp slot = %d, %d ,%d\n",
                         __FUNCTION__, p_slot->device,
-                        ctrl->slot_device_offset, hp_slot);
+                        ctrl->slot_device_offset, p_slot->hp_slot);
 
         if (POWER_CTRL(ctrl->ctrlcap)) {
                 /* Power on slot */
@@ -281,8 +270,6 @@ err_exit:
  */
 static int remove_board(struct slot *p_slot)
 {
-        u8 device;
-        u8 hp_slot;
         int retval = 0;
         struct controller *ctrl = p_slot->ctrl;
 
@@ -290,11 +277,7 @@ static int remove_board(struct slot *p_slot)
         if (retval)
                 return retval;
 
-        device = p_slot->device;
-        hp_slot = p_slot->device - ctrl->slot_device_offset;
-        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-
-        dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);
+        dbg("In %s, hp_slot = %d\n", __FUNCTION__, p_slot->hp_slot);
 
         if (POWER_CTRL(ctrl->ctrlcap)) {
                 /* power off slot */
@@ -621,12 +604,6 @@ int pciehp_disable_slot(struct slot *p_slot)
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
-                /*
-                 * After turning power off, we must wait for at least
-                 * 1 second before taking any action that relies on
-                 * power having been removed from the slot/adapter.
-                 */
-                msleep(1000);
         }
 
         ret = remove_board(p_slot);