]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
musb_hdrc: Search and replace wLoadCount with load_count
authorTony Lindgren <tony@atomide.com>
Thu, 16 Aug 2007 08:09:12 +0000 (01:09 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 16 Aug 2007 10:35:05 +0000 (03:35 -0700)
Search and replace wLoadCount with load_count

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/usb/musb/musb_host.c

index fe9dc78632410fb3b240bb49cdfca15eebeb98c0..c1a6de6978dd480731289f7b0f5fe7f7e7a2cb4c 100644 (file)
@@ -674,7 +674,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
        if (is_out) {
                u16     csr;
                u16     int_txe;
-               u16     wLoadCount;
+               u16     load_count;
 
                csr = musb_readw(epio, MUSB_TXCSR);
 
@@ -754,10 +754,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                }
 
                if (can_bulk_split(musb, qh->type))
-                       wLoadCount = min((u32) hw_ep->max_packet_sz_tx,
+                       load_count = min((u32) hw_ep->max_packet_sz_tx,
                                                len);
                else
-                       wLoadCount = min((u32) packet_sz, len);
+                       load_count = min((u32) packet_sz, len);
 
 #ifdef CONFIG_USB_INVENTRA_DMA
                if (dma_channel) {
@@ -797,7 +797,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                                        urb->transfer_dma,
                                        qh->segsize);
                        if (bDmaOk) {
-                               wLoadCount = 0;
+                               load_count = 0;
                        } else {
                                dma_controller->channel_release(dma_channel);
                                if (is_out)
@@ -838,7 +838,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                                        urb->transfer_dma,
                                        qh->segsize);
                        if (bDmaOk) {
-                               wLoadCount = 0;
+                               load_count = 0;
                        } else {
                                dma_controller->channel_release(dma_channel);
                                dma_channel = hw_ep->tx_channel = NULL;
@@ -850,12 +850,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
                        }
                }
 
-               if (wLoadCount) {
+               if (load_count) {
                        /* ASSERT:  TXCSR_DMAENAB was already cleared */
 
                        /* PIO to load FIFO */
-                       qh->segsize = wLoadCount;
-                       musb_write_fifo(hw_ep, wLoadCount, buf);
+                       qh->segsize = load_count;
+                       musb_write_fifo(hw_ep, load_count, buf);
                        csr = musb_readw(epio, MUSB_TXCSR);
                        csr &= ~(MUSB_TXCSR_DMAENAB
                                | MUSB_TXCSR_DMAMODE