usb: gadget: r8a66597: fix unused-but-set-variable warnings

This patch fixes the following (W=1) warnings:

drivers/usb/gadget/udc/r8a66597-udc.c: In function ‘r8a66597_irq’:
drivers/usb/gadget/udc/r8a66597-udc.c:1468:15: warning: variable ‘nrdyenb’ set but not used [-Wunused-but-set-variable]
  u16 brdyenb, nrdyenb, bempenb;
               ^
drivers/usb/gadget/udc/r8a66597-udc.c:1467:15: warning: variable ‘nrdysts’ set but not used [-Wunused-but-set-variable]
  u16 brdysts, nrdysts, bempsts;
               ^

In doing so, it removes calls to r8a66597_read function which does I/O
with the device, but I hope the reads don’t have any side effects that
are needed.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/udc/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index 8b300e6da7fcc4828184efe6184c4ca4fc90226d..f2c8862093a26b7b362905dc72034be0914b321d 100644 (file)
--- a/drivers/usb/gadget/udc/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
@@ -1464,8 +1464,6 @@ static irqreturn_t r8a66597_irq(int irq, void *_r8a66597)
        struct r8a66597 *r8a66597 = _r8a66597;
        u16 intsts0;
        u16 intenb0;
-       u16 brdysts, nrdysts, bempsts;
-       u16 brdyenb, nrdyenb, bempenb;
        u16 savepipe;
        u16 mask0;
 
@@ -1481,12 +1479,10 @@ static irqreturn_t r8a66597_irq(int irq, void *_r8a66597)
 
        mask0 = intsts0 & intenb0;
        if (mask0) {
-               brdysts = r8a66597_read(r8a66597, BRDYSTS);
-               nrdysts = r8a66597_read(r8a66597, NRDYSTS);
-               bempsts = r8a66597_read(r8a66597, BEMPSTS);
-               brdyenb = r8a66597_read(r8a66597, BRDYENB);
-               nrdyenb = r8a66597_read(r8a66597, NRDYENB);
-               bempenb = r8a66597_read(r8a66597, BEMPENB);
+               u16 brdysts = r8a66597_read(r8a66597, BRDYSTS);
+               u16 bempsts = r8a66597_read(r8a66597, BEMPSTS);
+               u16 brdyenb = r8a66597_read(r8a66597, BRDYENB);
+               u16 bempenb = r8a66597_read(r8a66597, BEMPENB);
 
                if (mask0 & VBINT) {
                        r8a66597_write(r8a66597,  0xffff & ~VBINT,
@@ -1658,20 +1654,14 @@ static int r8a66597_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 
 static int r8a66597_set_halt(struct usb_ep *_ep, int value)
 {
-       struct r8a66597_ep *ep;
-       struct r8a66597_request *req;
+       struct r8a66597_ep *ep = container_of(_ep, struct r8a66597_ep, ep);
        unsigned long flags;
        int ret = 0;
 
-       ep = container_of(_ep, struct r8a66597_ep, ep);
-       req = get_request_from_ep(ep);
-
        spin_lock_irqsave(&ep->r8a66597->lock, flags);
        if (!list_empty(&ep->queue)) {
                ret = -EAGAIN;
-               goto out;
-       }
-       if (value) {
+       } else if (value) {
                ep->busy = 1;
                pipe_stall(ep->r8a66597, ep->pipenum);
        } else {
@@ -1679,8 +1669,6 @@ static int r8a66597_set_halt(struct usb_ep *_ep, int value)
                ep->wedge = 0;
                pipe_stop(ep->r8a66597, ep->pipenum);
        }
-
-out:
        spin_unlock_irqrestore(&ep->r8a66597->lock, flags);
        return ret;
 }