Skip to content

Commit

Permalink
[PATCH] shpchp: Remove unused wait_for_ctrl_irq
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kenji Kaneshige authored and Greg Kroah-Hartman committed Mar 23, 2006
1 parent 09e1218 commit 68c0b67
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
21 changes: 0 additions & 21 deletions drivers/pci/hotplug/shpchp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/hotplug/shpchp_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 68c0b67

Please sign in to comment.