Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c0b671 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Greg Kroah-Hartman
Browse files

[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: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 09e1218e

drivers/pci/hotplug/shpchp.h

+0 −21
Original line number Diff line number Diff line
@@ -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;

drivers/pci/hotplug/shpchp_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */