usb: gadget: r8a66597-udc: change prototype of r8a66597_write_fifo

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index d3f81c9..60c62e4 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -723,7 +723,7 @@ static void irq_ep0_write(struct r8a66597_ep *ep, struct r8a66597_request *req)
        /* write fifo */
        if (req->req.buf) {
                if (size > 0)
-                       r8a66597_write_fifo(r8a66597, ep->fifoaddr, buf, size);
+                       r8a66597_write_fifo(r8a66597, ep, buf, size);
                if ((size == 0) || ((size % ep->ep.maxpacket) != 0))
                        r8a66597_bset(r8a66597, BVAL, ep->fifoctr);
        }
@@ -770,7 +770,7 @@ static void irq_packet_write(struct r8a66597_ep *ep,
 
        /* write fifo */
        if (req->req.buf) {
-               r8a66597_write_fifo(r8a66597, ep->fifoaddr, buf, size);
+               r8a66597_write_fifo(r8a66597, ep, buf, size);
                if ((size == 0)
                                || ((size % ep->ep.maxpacket) != 0)
                                || ((bufsize != ep->ep.maxpacket)

diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/r8a66597-udc.h
index a373c4e..31047f8 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/r8a66597-udc.h
@@ -173,11 +173,11 @@ static inline void r8a66597_write(struct r8a66597 *r8a66597, u16 val,
 }
 
 static inline void r8a66597_write_fifo(struct r8a66597 *r8a66597,
-                                      unsigned long offset,
+                                      struct r8a66597_ep *ep,
                                       unsigned char *buf,
                                       int len)
 {
-       void __iomem *fifoaddr = r8a66597->reg + offset;
+       void __iomem *fifoaddr = r8a66597->reg + ep->fifoaddr;
        int adj = 0;
        int i;