]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: isp1760: compress return logic into one line
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Mon, 10 Jul 2017 02:00:07 +0000 (21:00 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jul 2017 11:13:44 +0000 (13:13 +0200)
Simplify return logic to avoid unnecessary variable assignment.

This issue was detected using Coccinelle and the following
semantic patch:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/isp1760/isp1760-hcd.c

index ac31d19cc54bcee01cbde7e850d5744e53542777..8e59e0c02b8a421ecd6f2b88e75afc4001fde0e2 100644 (file)
@@ -396,7 +396,6 @@ static int handshake(struct usb_hcd *hcd, u32 reg,
 /* reset a non-running (STS_HALT == 1) controller */
 static int ehci_reset(struct usb_hcd *hcd)
 {
-       int retval;
        struct isp1760_hcd *priv = hcd_to_priv(hcd);
 
        u32 command = reg_read32(hcd->regs, HC_USBCMD);
@@ -405,9 +404,8 @@ static int ehci_reset(struct usb_hcd *hcd)
        reg_write32(hcd->regs, HC_USBCMD, command);
        hcd->state = HC_STATE_HALT;
        priv->next_statechange = jiffies;
-       retval = handshake(hcd, HC_USBCMD,
-                           CMD_RESET, 0, 250 * 1000);
-       return retval;
+
+       return handshake(hcd, HC_USBCMD, CMD_RESET, 0, 250 * 1000);
 }
 
 static struct isp1760_qh *qh_alloc(gfp_t flags)