From 98664bb69d3afa6aee14a326d087c37abf535cca Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Tue, 21 Feb 2006 15:45:42 -0800 Subject: [PATCH] --- yaml --- r: 23197 b: refs/heads/master c: 68c0b671491088d79611fa965bbf94b3bc0024a4 h: refs/heads/master i: 23195: 9b779f59e1ee6b5b86a46790061e71182c19564b v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/shpchp.h | 21 --------------------- trunk/drivers/pci/hotplug/shpchp_ctrl.c | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 4f0c7683a5ae..612f45065235 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09e1218eccf58f6174fa68360a7c8dcfe457fe9b +refs/heads/master: 68c0b671491088d79611fa965bbf94b3bc0024a4 diff --git a/trunk/drivers/pci/hotplug/shpchp.h b/trunk/drivers/pci/hotplug/shpchp.h index ce792b3cf9de..6e1fb1bdc243 100644 --- a/trunk/drivers/pci/hotplug/shpchp.h +++ b/trunk/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/trunk/drivers/pci/hotplug/shpchp_ctrl.c b/trunk/drivers/pci/hotplug/shpchp_ctrl.c index 1a7003d4ba96..b709328a4145 100644 --- a/trunk/drivers/pci/hotplug/shpchp_ctrl.c +++ b/trunk/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 */