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

Commit c765d4ca authored by Karsten Wiese's avatar Karsten Wiese Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: Refactor "if (handshake()) state = HC_STATE_HALT" 



Refactor the EHCI "if (handshake()) state = HC_STATE_HALT" idiom,
which appears 4 times, by replacing it with calls to a new function
called handshake_on_error_set_halt().  Saves a few bytes too.

Signed-off-by: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 96f9bc37

drivers/usb/host/ehci-hcd.c

+14 −9
Original line number Diff line number Diff line
@@ -145,6 +145,16 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr, 
	return -ETIMEDOUT;

}



static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,

				       u32 mask, u32 done, int usec)

{

	int error = handshake(ehci, ptr, mask, done, usec);

	if (error)

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;



	return error;

}



/* force HC to halt state from unknown (EHCI spec section 2.3) */

static int ehci_halt (struct ehci_hcd *ehci)

{
@@ -217,11 +227,9 @@ static void ehci_quiesce (struct ehci_hcd *ehci) 
	/* wait for any schedule enables/disables to take effect */

	temp = ehci_readl(ehci, &ehci->regs->command) << 10;

	temp &= STS_ASS | STS_PSS;

	if (handshake (ehci, &ehci->regs->status, STS_ASS | STS_PSS,

				temp, 16 * 125) != 0) {

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;

	if (handshake_on_error_set_halt(ehci, &ehci->regs->status,

					STS_ASS | STS_PSS, temp, 16 * 125))

		return;

	}



	/* then disable anything that's still active */

	temp = ehci_readl(ehci, &ehci->regs->command);
@@ -229,11 +237,8 @@ static void ehci_quiesce (struct ehci_hcd *ehci) 
	ehci_writel(ehci, temp, &ehci->regs->command);



	/* hardware can take 16 microframes to turn off ... */

	if (handshake (ehci, &ehci->regs->status, STS_ASS | STS_PSS,

				0, 16 * 125) != 0) {

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;

		return;

	}

	handshake_on_error_set_halt(ehci, &ehci->regs->status,

				    STS_ASS | STS_PSS, 0, 16 * 125);

}



/*-------------------------------------------------------------------------*/

drivers/usb/host/ehci-sched.c

+6 −8
Original line number Diff line number Diff line
@@ -440,11 +440,10 @@ static int enable_periodic (struct ehci_hcd *ehci) 
	/* did clearing PSE did take effect yet?

	 * takes effect only at frame boundaries...

	 */

	status = handshake(ehci, &ehci->regs->status, STS_PSS, 0, 9 * 125);

	if (status != 0) {

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;

	status = handshake_on_error_set_halt(ehci, &ehci->regs->status,

					     STS_PSS, 0, 9 * 125);

	if (status)

		return status;

	}



	cmd = ehci_readl(ehci, &ehci->regs->command) | CMD_PSE;

	ehci_writel(ehci, cmd, &ehci->regs->command);
@@ -465,11 +464,10 @@ static int disable_periodic (struct ehci_hcd *ehci) 
	/* did setting PSE not take effect yet?

	 * takes effect only at frame boundaries...

	 */

	status = handshake(ehci, &ehci->regs->status, STS_PSS, STS_PSS, 9 * 125);

	if (status != 0) {

		ehci_to_hcd(ehci)->state = HC_STATE_HALT;

	status = handshake_on_error_set_halt(ehci, &ehci->regs->status,

					     STS_PSS, STS_PSS, 9 * 125);

	if (status)

		return status;

	}



	cmd = ehci_readl(ehci, &ehci->regs->command) & ~CMD_PSE;

	ehci_writel(ehci, cmd, &ehci->regs->command);