2 files changed, 1 insertions, 22 deletions

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ce792b3cf9de..6e1fb1bdc243 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -325,27 +325,6 @@ static inline struct slot *shpchp_find_slot (struct controller *ctrl, u8 device)
         return NULL;
 }
 
-static inline int wait_for_ctrl_irq (struct controller *ctrl)
-{
-    DECLARE_WAITQUEUE(wait, current);
-        int retval = 0;
-
-        add_wait_queue(&ctrl->queue, &wait);
-
-        if (!shpchp_poll_mode) {
-                /* Sleep for up to 1 second */
-                msleep_interruptible(1000);
-        } else {
-                /* Sleep for up to 2 seconds */
-                msleep_interruptible(2000);
-        }
-        remove_wait_queue(&ctrl->queue, &wait);
-        if (signal_pending(current))
-                retval =  -EINTR;
-
-        return retval;
-}
-
 static inline void amd_pogo_errata_save_misc_reg(struct slot *p_slot)
 {
         u32 pcix_misc2_temp;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 1a7003d4ba96..b709328a4145 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -441,7 +441,7 @@ static int board_added(struct slot *p_slot)
         }
 
         /* Wait for ~1 second */
-        wait_for_ctrl_irq (ctrl);
+        msleep(1000);
 
         dbg("%s: slot status = %x\n", __FUNCTION__, p_slot->status);
         /* Check for a power fault */