musb_hdrc: Search and replace wFrame with frame

Search and replace wFrame with frame

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index dd5e2845cbbfa5a099da8b9bf6075fb8f6bd6a14..0db7b5e607a44c5cad8cf0995c812e0622267c0a 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -169,7 +169,7 @@ static inline void cppi_host_txdma_start(struct musb_hw_ep *ep)
 static void
 musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
 {
-       u16                     wFrame;
+       u16                     frame;
        u32                     len;
        void                    *buf;
        void __iomem            *mbase =  musb->mregs;
@@ -232,12 +232,12 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
        case USB_ENDPOINT_XFER_INT:
                DBG(3, "check whether there's still time for periodic Tx\n");
                qh->iso_idx = 0;
-               wFrame = musb_readw(mbase, MUSB_FRAME);
+               frame = musb_readw(mbase, MUSB_FRAME);
                /* FIXME this doesn't implement that scheduling policy ...
                 * or handle framecounter wrapping
                 */
                if ((urb->transfer_flags & URB_ISO_ASAP)
-                               || (wFrame >= urb->start_frame)) {
+                               || (frame >= urb->start_frame)) {
                        /* REVISIT the SOF irq handler shouldn't duplicate
                         * this code; and we don't init urb->start_frame...
                         */

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 05f4e52ff4f17464c3b07064ca05684da1e0c347..914d68460bfa500ecd585bf836c44f297a5a3202 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -663,20 +663,20 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 int_usb,
                void __iomem *mbase = musb->mregs;
                struct musb_hw_ep       *ep;
                u8 epnum;
-               u16 wFrame;
+               u16 frame;
 
                DBG(6, "START_OF_FRAME\n");
                handled = IRQ_HANDLED;
 
                /* start any periodic Tx transfers waiting for current frame */
-               wFrame = musb_readw(mbase, MUSB_FRAME);
+               frame = musb_readw(mbase, MUSB_FRAME);
                ep = musb->endpoints;
                for (epnum = 1; (epnum < musb->nr_endpoints)
                                        && (musb->epmask >= (1 << epnum));
                                epnum++, ep++) {
                        // FIXME handle framecounter wraps (12 bits)
                        // eliminate duplicated StartUrb logic
-                       if (ep->dwWaitFrame >= wFrame) {
+                       if (ep->dwWaitFrame >= frame) {
                                ep->dwWaitFrame = 0;
                                printk("SOF --> periodic TX%s on %d\n",
                                        ep->tx_channel ? " DMA" : "",