usb: musb: gadget: kill unreachable code in musb_g_rx()
authorSergei Shtylyov <sshtylyov@ru.mvista.com>
Fri, 24 Sep 2010 10:44:12 +0000 (13:44 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 22 Oct 2010 17:21:55 +0000 (10:21 -0700)
musb_g_rx() always returns if next_request() call yields NULL, so the DBG()
near the function's end can never be invoked. Remove it along with unneeded
'return'; also remove the duplicate 'request' check...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/musb/musb_gadget.c

index f497586e36ec706646f40af6a9620df2dd3b1a56..6a8c061b66f1b07f92f89f912ef4962c8da41b2a 100644 (file)
@@ -775,7 +775,7 @@ void musb_g_rx(struct musb *musb, u8 epnum)
                musb_writew(epio, MUSB_RXCSR, csr);
 
                DBG(3, "%s iso overrun on %p\n", musb_ep->name, request);
-               if (request && request->status == -EINPROGRESS)
+               if (request->status == -EINPROGRESS)
                        request->status = -EOVERFLOW;
        }
        if (csr & MUSB_RXCSR_INCOMPRX) {
@@ -828,14 +828,8 @@ void musb_g_rx(struct musb *musb, u8 epnum)
                        return;
        }
 
-       /* analyze request if the ep is hot */
-       if (request)
-               rxstate(musb, to_musb_request(request));
-       else
-               DBG(3, "packet waiting for %s%s request\n",
-                               musb_ep->desc ? "" : "inactive ",
-                               musb_ep->end_point.name);
-       return;
+       /* Analyze request */
+       rxstate(musb, to_musb_request(request));
 }
 
 /* ------------------------------------------------------------ */