[PATCH] shpchp: Remove unused wait_for_ctrl_irq

The wait_for_ctrl_irq() function in SHPCHP driver is no longer needed.
This patch removes that. This patch has no functional change.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ce792b3cf9deb5f3d3a2ffb298e761bce3b34235..6e1fb1bdc243e8dc373df77eecb4a360a757cfa7 100644 (file)
--- 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 1a7003d4ba965ce9b7b6c5af0f8d99c9af7e2249..b709328a41451845a5b3c57c4cd0a8b483d81eac 100644 (file)
--- 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 */