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

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

drivers/usb/gadget/udc/mv_u3d_core.c: In function ‘mv_u3d_process_ep_req’:
drivers/usb/gadget/udc/mv_u3d_core.c:124:6: warning: variable ‘trb_complete’ set but not used [-Wunused-but-set-variable]
  int trb_complete, actual, remaining_length = 0;
      ^
drivers/usb/gadget/udc/mv_u3d_core.c:123:28: warning: variable ‘curr_ep_context’ set but not used [-Wunused-but-set-variable]
  struct mv_u3d_ep_context *curr_ep_context;
                            ^
drivers/usb/gadget/udc/mv_u3d_core.c:122:13: warning: variable ‘cur_deq_lo’ set but not used [-Wunused-but-set-variable]
  dma_addr_t cur_deq_lo;
             ^
drivers/usb/gadget/udc/mv_u3d_core.c: In function ‘mv_u3d_ep_enable’:
drivers/usb/gadget/udc/mv_u3d_core.c:530:28: warning: variable ‘ep_context’ set but not used [-Wunused-but-set-variable]
  struct mv_u3d_ep_context *ep_context;
                            ^
drivers/usb/gadget/udc/mv_u3d_core.c: In function ‘mv_u3d_ep_disable’:
drivers/usb/gadget/udc/mv_u3d_core.c:636:28: warning: variable ‘ep_context’ set but not used [-Wunused-but-set-variable]
  struct mv_u3d_ep_context *ep_context;
                            ^
In doing so, it removes calls to ioread32 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/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index dafe74eb9adeca207549ed71910d77b22ccd03b2..b9e19a5913224be4fca62cbc03d93de1cb4c2701 100644 (file)
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -119,18 +119,14 @@ static int mv_u3d_process_ep_req(struct mv_u3d *u3d, int index,
        struct mv_u3d_req *curr_req)
 {
        struct mv_u3d_trb       *curr_trb;
-       dma_addr_t cur_deq_lo;
-       struct mv_u3d_ep_context        *curr_ep_context;
-       int trb_complete, actual, remaining_length = 0;
+       int actual, remaining_length = 0;
        int direction, ep_num;
        int retval = 0;
        u32 tmp, status, length;
 
-       curr_ep_context = &u3d->ep_context[index];
        direction = index % 2;
        ep_num = index / 2;
 
-       trb_complete = 0;
        actual = curr_req->req.length;
 
        while (!list_empty(&curr_req->trb_list)) {
@@ -143,15 +139,10 @@ static int mv_u3d_process_ep_req(struct mv_u3d *u3d, int index,
                }
 
                curr_trb->trb_hw->ctrl.own = 0;
-               if (direction == MV_U3D_EP_DIR_OUT) {
+               if (direction == MV_U3D_EP_DIR_OUT)
                        tmp = ioread32(&u3d->vuc_regs->rxst[ep_num].statuslo);
-                       cur_deq_lo =
-                               ioread32(&u3d->vuc_regs->rxst[ep_num].curdeqlo);
-               } else {
+               else
                        tmp = ioread32(&u3d->vuc_regs->txst[ep_num].statuslo);
-                       cur_deq_lo =
-                               ioread32(&u3d->vuc_regs->txst[ep_num].curdeqlo);
-               }
 
                status = tmp >> MV_U3D_XFERSTATUS_COMPLETE_SHIFT;
                length = tmp & MV_U3D_XFERSTATUS_TRB_LENGTH_MASK;
@@ -527,7 +518,6 @@ static int mv_u3d_ep_enable(struct usb_ep *_ep,
 {
        struct mv_u3d *u3d;
        struct mv_u3d_ep *ep;
-       struct mv_u3d_ep_context *ep_context;
        u16 max = 0;
        unsigned maxburst = 0;
        u32 epxcr, direction;
@@ -548,9 +538,6 @@ static int mv_u3d_ep_enable(struct usb_ep *_ep,
                _ep->maxburst = 1;
        maxburst = _ep->maxburst;
 
-       /* Get the endpoint context address */
-       ep_context = (struct mv_u3d_ep_context *)ep->ep_context;
-
        /* Set the max burst size */
        switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) {
        case USB_ENDPOINT_XFER_BULK:
@@ -633,7 +620,6 @@ static int  mv_u3d_ep_disable(struct usb_ep *_ep)
 {
        struct mv_u3d *u3d;
        struct mv_u3d_ep *ep;
-       struct mv_u3d_ep_context *ep_context;
        u32 epxcr, direction;
        unsigned long flags;
 
@@ -646,9 +632,6 @@ static int  mv_u3d_ep_disable(struct usb_ep *_ep)
 
        u3d = ep->u3d;
 
-       /* Get the endpoint context address */
-       ep_context = ep->ep_context;
-
        direction = mv_u3d_ep_dir(ep);
 
        /* nuke all pending requests (does flush) */