musb_hdrc: Search and replace nEnd with epnum

Search and replace nEnd with epnum

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

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index bd67b70d35fb75c8612abbfb3f5d72589650673c..841d8bd626b60917ff79e292f8a88244cd612dd0 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1331,8 +1331,8 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep)
 {
        struct musb_ep  *musb_ep = to_musb_ep(ep);
        struct musb     *musb = musb_ep->musb;
-       u8              nEnd = musb_ep->current_epnum;
-       void __iomem    *epio = musb->endpoints[nEnd].regs;
+       u8              epnum = musb_ep->current_epnum;
+       void __iomem    *epio = musb->endpoints[epnum].regs;
        void __iomem    *mbase;
        unsigned long   flags;
        u16             csr, int_txe;
@@ -1340,11 +1340,11 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep)
        mbase = musb->mregs;
 
        spin_lock_irqsave(&musb->lock, flags);
-       musb_ep_select(mbase, (u8) nEnd);
+       musb_ep_select(mbase, (u8) epnum);
 
        /* disable interrupts */
        int_txe = musb_readw(mbase, MUSB_INTRTXE);
-       musb_writew(mbase, MUSB_INTRTXE, int_txe & ~(1 << nEnd));
+       musb_writew(mbase, MUSB_INTRTXE, int_txe & ~(1 << epnum));
 
        if (musb_ep->is_in) {
                csr = musb_readw(epio, MUSB_TXCSR);

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 7a517748e6459a8822dd989f4aaecd77913c22a8..dd5e2845cbbfa5a099da8b9bf6075fb8f6bd6a14 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -1661,7 +1661,7 @@ static int musb_schedule(
 {
        int                     idle;
        int                     best_diff;
-       int                     best_end, nEnd;
+       int                     best_end, epnum;
        struct musb_hw_ep       *hw_ep = NULL;
        struct list_head        *head = NULL;
 
@@ -1706,12 +1706,12 @@ static int musb_schedule(
        best_diff = 4096;
        best_end = -1;
 
-       for (nEnd = 1; nEnd < musb->nr_endpoints; nEnd++) {
+       for (epnum = 1; epnum < musb->nr_endpoints; epnum++) {
                int     diff;
 
-               if (musb->periodic[nEnd])
+               if (musb->periodic[epnum])
                        continue;
-               hw_ep = &musb->endpoints[nEnd];
+               hw_ep = &musb->endpoints[epnum];
                if (hw_ep == musb->bulk_ep)
                        continue;
 
@@ -1722,7 +1722,7 @@ static int musb_schedule(
 
                if (diff > 0 && best_diff > diff) {
                        best_diff = diff;
-                       best_end = nEnd;
+                       best_end = epnum;
                }
        }
        if (best_end < 0)