summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>2006-02-21 15:45:42 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 14:35:13 -0800
commit68c0b671491088d79611fa965bbf94b3bc0024a4 (patch)
treed5e8ba499b378e53edc73b1470a988aefa0a0e0e /drivers
parent09e1218eccf58f6174fa68360a7c8dcfe457fe9b (diff)
downloadblackbird-op-linux-68c0b671491088d79611fa965bbf94b3bc0024a4.tar.gz
blackbird-op-linux-68c0b671491088d79611fa965bbf94b3bc0024a4.zip
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/hotplug/shpchp.h21
-rw-r--r--drivers/pci/hotplug/shpchp_ctrl.c2
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 */
OpenPOWER on IntegriCloud