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: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 8a8e08a51ba3..38c606c13db1 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -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);