musb_hdrc: Search and replace bLocalEnd with epnum

Search and replace bLocalEnd with epnum

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

diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index 1c4d3c418464b987c432c437ae835af2a75fc880..15bf67ee676eb3db631d498733ad4c334b558cea 100644 (file)
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -289,7 +289,7 @@ cppi_channel_allocate(struct dma_controller *c,
        u8                      chNum;
        struct cppi_channel     *otgCh;
        void __iomem            *tibase;
-       int                     local_end = ep->bLocalEnd;
+       int                     local_end = ep->epnum;
 
        pController = container_of(c, struct cppi, Controller);
        tibase = pController->pCoreBase - DAVINCI_BASE_OFFSET;

diff --git a/drivers/usb/musb/dma.h b/drivers/usb/musb/dma.h
index 8aecd7a3cd327757a516194af2273146b0c3091e..e00288cf694b40d95ebb1cd2e3470111f3e00dfa 100644 (file)
--- a/drivers/usb/musb/dma.h
+++ b/drivers/usb/musb/dma.h
@@ -180,7 +180,7 @@ struct dma_controller {
 };
 
 /* called after channel_program(), may indicate a fault */
-extern void musb_dma_completion(struct musb *musb, u8 bLocalEnd, u8 bTransmit);
+extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 bTransmit);
 
 
 extern struct dma_controller *__init

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index ffd8ed181ad586f73a021bc45ea8df8e44162323..8da2acb05380889915149e1647d65a0577de3007 100644 (file)
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -139,7 +139,7 @@ static inline void musb_h_tx_start(struct musb_hw_ep *ep)
        u16     txcsr;
 
        /* NOTE: no locks here; caller should lock and select EP */
-       if (ep->bLocalEnd) {
+       if (ep->epnum) {
                txcsr = musb_readw(ep->regs, MGC_O_HDRC_TXCSR);
                txcsr |= MGC_M_TXCSR_TXPKTRDY | MGC_M_TXCSR_H_WZC_BITS;
                musb_writew(ep->regs, MGC_O_HDRC_TXCSR, txcsr);
@@ -177,7 +177,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
        struct musb_hw_ep       *hw_ep = qh->hw_ep;
        unsigned                nPipe = urb->pipe;
        u8                      bAddress = usb_pipedevice(nPipe);
-       int                     bEnd = hw_ep->bLocalEnd;
+       int                     bEnd = hw_ep->epnum;
 
        /* initialize software qh state */
        qh->offset = 0;
@@ -396,7 +396,7 @@ musb_giveback(struct musb_qh *qh, struct urb *urb, int status)
                         * de-allocated if it's tracked and allocated;
                         * and where we'd update the schedule tree...
                         */
-                       musb->periodic[ep->bLocalEnd] = NULL;
+                       musb->periodic[ep->epnum] = NULL;
                        kfree(qh);
                        qh = NULL;
                        break;
@@ -437,7 +437,7 @@ musb_advance_schedule(struct musb *musb, struct urb *urb,
 
        if (qh && qh->is_ready && !list_empty(&qh->hep->urb_list)) {
                DBG(4, "... next ep%d %cX urb %p\n",
-                               hw_ep->bLocalEnd, is_in ? 'R' : 'T',
+                               hw_ep->epnum, is_in ? 'R' : 'T',
                                next_urb(qh));
                musb_start_urb(musb, is_in, qh);
        }
@@ -592,7 +592,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)
        } else {
                csr = musb_readw(ep->regs, MGC_O_HDRC_RXCSR);
                if (csr & MGC_M_RXCSR_RXPKTRDY)
-                       WARN("rx%d, packet/%d ready?\n", ep->bLocalEnd,
+                       WARN("rx%d, packet/%d ready?\n", ep->epnum,
                                musb_readw(ep->regs, MGC_O_HDRC_RXCOUNT));
 
                musb_h_flush_rxfifo(ep, MGC_M_RXCSR_CLRDATATOG);
@@ -893,7 +893,7 @@ static void musb_ep_program(struct musb *musb, u8 bEnd,
                                        | MGC_M_RXCSR_DMAENAB
                                        | MGC_M_RXCSR_H_REQPKT))
                                ERR("broken !rx_reinit, ep%d csr %04x\n",
-                                               hw_ep->bLocalEnd, csr);
+                                               hw_ep->epnum, csr);
 
                        /* scrub any stale state, leaving toggle alone */
                        csr &= MGC_M_RXCSR_DISNYET;
@@ -1903,7 +1903,7 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh, int is_in)
 {
        struct musb_hw_ep       *ep = qh->hw_ep;
        void __iomem            *epio = ep->regs;
-       unsigned                hw_end = ep->bLocalEnd;
+       unsigned                hw_end = ep->epnum;
        void __iomem            *regs = ep->musb->mregs;
        u16                     csr;
        int                     status = 0;
@@ -1918,7 +1918,7 @@ static int musb_cleanup_urb(struct urb *urb, struct musb_qh *qh, int is_in)
                        status = ep->musb->pDmaController->channel_abort(dma);
                        DBG(status ? 1 : 3,
                                "abort %cX%d DMA for urb %p --> %d\n",
-                               is_in ? 'R' : 'T', ep->bLocalEnd,
+                               is_in ? 'R' : 'T', ep->epnum,
                                urb, status);
                        urb->actual_length += dma->dwActualLength;
                }

diff --git a/drivers/usb/musb/musbdefs.h b/drivers/usb/musb/musbdefs.h
index 3505be25de221848cbb7712027ea15b32b7cc89f..06a99d3e4b1e1bf1ce27f2cb8d8bf2fb5fb47df6 100644 (file)
--- a/drivers/usb/musb/musbdefs.h
+++ b/drivers/usb/musb/musbdefs.h
@@ -283,7 +283,7 @@ struct musb_hw_ep {
 #endif
 
        /* index in musb->aLocalEnd[]  */
-       u8                      bLocalEnd;
+       u8                      epnum;
 
        /* hardware configuration, possibly dynamic */
        u8                      bIsSharedFifo;

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 6ec8f1a9d37e67cfc610af4eacce31ecc004a5a7..4a4c7cb977548b7b746021afe5c481aaa5243f38 100644 (file)
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -140,7 +140,7 @@ static struct dma_channel* dma_channel_allocate(struct dma_controller *c,
                        pImplChannel = &(pController->aChannel[bBit]);
                        pImplChannel->pController = pController;
                        pImplChannel->bIndex = bBit;
-                       pImplChannel->bEnd = hw_ep->bLocalEnd;
+                       pImplChannel->bEnd = hw_ep->epnum;
                        pImplChannel->bTransmit = bTransmit;
                        pChannel = &(pImplChannel->Channel);
                        pChannel->pPrivateData = pImplChannel;

diff --git a/drivers/usb/musb/plat_uds.c b/drivers/usb/musb/plat_uds.c
index 7582a89ff0a76d43dcb49460216e9052ebe253c2..9ffa816f751b5ab37636c30855d87cc5cc7af2bd 100644 (file)
--- a/drivers/usb/musb/plat_uds.c
+++ b/drivers/usb/musb/plat_uds.c
@@ -176,7 +176,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
        prefetch((u8 *)src);
 
        DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-                       'T', hw_ep->bLocalEnd, fifo, len, src);
+                       'T', hw_ep->epnum, fifo, len, src);
 
        /* we can't assume unaligned reads work */
        if (likely((0x01 & (unsigned long) src) == 0)) {
@@ -214,7 +214,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
        void __iomem *fifo = hw_ep->fifo;
 
        DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
-                       'R', hw_ep->bLocalEnd, fifo, len, dst);
+                       'R', hw_ep->epnum, fifo, len, dst);
 
        /* we can't assume unaligned writes work */
        if (likely((0x01 & (unsigned long) dst) == 0)) {
@@ -1044,13 +1044,13 @@ fifo_setup(struct musb *musb, struct musb_hw_ep  *hw_ep,
        }
 
        /* configure the FIFO */
-       musb_writeb(mbase, MGC_O_HDRC_INDEX, hw_ep->bLocalEnd);
+       musb_writeb(mbase, MGC_O_HDRC_INDEX, hw_ep->epnum);
 
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
        /* EP0 reserved endpoint for control, bidirectional;
         * EP1 reserved for bulk, two unidirection halves.
         */
-       if (hw_ep->bLocalEnd == 1)
+       if (hw_ep->epnum == 1)
                musb->bulk_ep = hw_ep;
        /* REVISIT error check:  be sure ep0 can both rx and tx ... */
 #endif
@@ -1085,7 +1085,7 @@ fifo_setup(struct musb *musb, struct musb_hw_ep  *hw_ep,
        /* NOTE rx and tx endpoint irqs aren't managed separately,
         * which happens to be ok
         */
-       musb->wEndMask |= (1 << hw_ep->bLocalEnd);
+       musb->wEndMask |= (1 << hw_ep->epnum);
 
        return offset + (maxpacket << ((c_size & MGC_M_FIFOSZ_DPB) ? 1 : 0));
 }
@@ -1538,13 +1538,13 @@ static int __initdata use_dma = 1;
 module_param(use_dma, bool, 0);
 MODULE_PARM_DESC(use_dma, "enable/disable use of DMA");
 
-void musb_dma_completion(struct musb *musb, u8 bLocalEnd, u8 bTransmit)
+void musb_dma_completion(struct musb *musb, u8 epnum, u8 bTransmit)
 {
        u8      devctl = musb_readb(musb->mregs, MGC_O_HDRC_DEVCTL);
 
        /* called with controller lock already held */
 
-       if (!bLocalEnd) {
+       if (!epnum) {
 #ifndef CONFIG_USB_TUSB_OMAP_DMA
                if (!is_cppi_enabled()) {
                        /* endpoint 0 */
@@ -1559,19 +1559,19 @@ void musb_dma_completion(struct musb *musb, u8 bLocalEnd, u8 bTransmit)
                if (bTransmit) {
                        if (devctl & MGC_M_DEVCTL_HM) {
                                if (is_host_capable())
-                                       musb_host_tx(musb, bLocalEnd);
+                                       musb_host_tx(musb, epnum);
                        } else {
                                if (is_peripheral_capable())
-                                       musb_g_tx(musb, bLocalEnd);
+                                       musb_g_tx(musb, epnum);
                        }
                } else {
                        /* receive */
                        if (devctl & MGC_M_DEVCTL_HM) {
                                if (is_host_capable())
-                                       musb_host_rx(musb, bLocalEnd);
+                                       musb_host_rx(musb, epnum);
                        } else {
                                if (is_peripheral_capable())
-                                       musb_g_rx(musb, bLocalEnd);
+                                       musb_g_rx(musb, epnum);
                        }
                }
        }
@@ -1776,7 +1776,7 @@ allocate_instance(struct device *dev, void __iomem *mbase)
                        epnum++, ep++) {
 
                ep->musb = musb;
-               ep->bLocalEnd = epnum;
+               ep->epnum = epnum;
        }
 
        musb->controller = dev;

diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 77e71210e5afdd31b9548f194db40f112d4c7380..1315a4d867969b744e7e6647d47217a05630f7c6 100644 (file)
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -152,7 +152,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf)
 {
        void __iomem    *ep_conf = hw_ep->conf;
        void __iomem    *fifo = hw_ep->fifo;
-       u8              epnum = hw_ep->bLocalEnd;
+       u8              epnum = hw_ep->epnum;
 
        prefetch(buf);
 
@@ -201,7 +201,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf)
 {
        void __iomem    *ep_conf = hw_ep->conf;
        void __iomem    *fifo = hw_ep->fifo;
-       u8              epnum = hw_ep->bLocalEnd;
+       u8              epnum = hw_ep->epnum;
 
        DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
                        'R', epnum, fifo, len, buf);

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index a8e3eb627184e3f87aa82388b7ffa3bc039977d5..c9274c6289574d2f7ba2e7ea4b6957ac81092649 100644 (file)
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -508,13 +508,13 @@ tusb_omap_dma_allocate(struct dma_controller *c,
 
        reg = musb_readl(tusb_base, TUSB_DMA_INT_MASK);
        if (tx)
-               reg &= ~(1 << hw_ep->bLocalEnd);
+               reg &= ~(1 << hw_ep->epnum);
        else
-               reg &= ~(1 << (hw_ep->bLocalEnd + 15));
+               reg &= ~(1 << (hw_ep->epnum + 15));
        musb_writel(tusb_base, TUSB_DMA_INT_MASK, reg);
 
        /* REVISIT: Why does dmareq5 not work? */
-       if (hw_ep->bLocalEnd == 0) {
+       if (hw_ep->epnum == 0) {
                DBG(3, "Not allowing DMA for ep0 %s\n", tx ? "tx" : "rx");
                return NULL;
        }
@@ -543,7 +543,7 @@ tusb_omap_dma_allocate(struct dma_controller *c,
        chdat->musb = tusb_dma->musb;
        chdat->tusb_base = tusb_dma->tusb_base;
        chdat->hw_ep = hw_ep;
-       chdat->epnum = hw_ep->bLocalEnd;
+       chdat->epnum = hw_ep->epnum;
        chdat->dmareq = -1;
        chdat->completed_len = 0;
        chdat->tusb_dma = tusb_dma;