From pcihpd-discuss-admin@lists.sourceforge.net Tue Feb 21 15:41:04 2006 From: Kristen Accardi To: Greg KH Cc: Kenji Kaneshige , Kristen Accardi Message-Id: <1140565542.24286.20.camel@whizzy> Subject: shpchp: Remove unused wait_for_ctrl_irq Date: Tue, 21 Feb 2006 15:45:42 -0800 From: Kenji Kaneshige 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 Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman --- drivers/pci/hotplug/shpchp.h | 21 --------------------- drivers/pci/hotplug/shpchp_ctrl.c | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) --- gregkh-2.6.orig/drivers/pci/hotplug/shpchp.h +++ gregkh-2.6/drivers/pci/hotplug/shpchp.h @@ -325,27 +325,6 @@ static inline struct slot *shpchp_find_s 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; --- gregkh-2.6.orig/drivers/pci/hotplug/shpchp_ctrl.c +++ gregkh-2.6/drivers/pci/hotplug/shpchp_ctrl.c @@ -441,7 +441,7 @@ static int board_added(struct slot *p_sl } /* 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 */