musb_hdrc: Yet more musb clean-up
cover musb_hdrc: Yet more musb clean-up
Hi all,
Here's still some more musb driver clean-up, including the license update to make it generic instead of Mentor specific.
Again, I haven't touched cppi_dma or musbhsdma code much except for common variable names. These files still suffer from badCamelCasingSymptoms.
Tested on tusb.
Regards,
Tony
PATCH 1/36 musb_hdrc: Add Nokia copyright, make GPLv2 license generic
This patch adds Nokia copyright, and makes the license text generic to cover all parties involved by removing "Inventra Controller Driver" and "Mentor Graphics" specific text from the license.
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/debug.h | 51 +++++++++++++++++++------------------- drivers/usb/musb/dma.h | 53 ++++++++++++++++++++------------------- drivers/usb/musb/g_ep0.c | 51 +++++++++++++++++++------------------- drivers/usb/musb/musb_gadget.c | 51 +++++++++++++++++++------------------- drivers/usb/musb/musb_gadget.h | 51 +++++++++++++++++++------------------- drivers/usb/musb/musb_host.c | 52 +++++++++++++++++++------------------- drivers/usb/musb/musb_host.h | 51 +++++++++++++++++++------------------- drivers/usb/musb/musb_procfs.c | 51 +++++++++++++++++++------------------- drivers/usb/musb/musbdefs.h | 51 +++++++++++++++++++------------------- drivers/usb/musb/musbhdrc.h | 47 ++++++++++++++++++----------------- drivers/usb/musb/musbhsdma.c | 50 +++++++++++++++++++------------------- drivers/usb/musb/plat_arc.h | 53 +++++++++++++++++++--------------------- drivers/usb/musb/plat_uds.c | 52 +++++++++++++++++++------------------- drivers/usb/musb/virthub.c | 52 +++++++++++++++++++------------------- 14 files changed, 361 insertions(+), 355 deletions(-)
drivers/usb/musb/debug.h +26 -25
@@ -1,35 +1,36 @@ -/****************************************************************** +/* +* MUSB OTG driver debug defines +* * Copyright 2005 Mentor Graphics Corporation * Copyright (C) 2005-2006 by Texas Instruments +* Copyright (C) 2006-2007 Nokia Corporation * -* This file is part of the Inventra Controller Driver for Linux. -* -* The Inventra Controller Driver for Linux is free software; you -* can redistribute it and/or modify it under the terms of the GNU -* General Public License version 2 as published by the Free Software -* Foundation. +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. * -* The Inventra Controller Driver for Linux is distributed in -* the hope that it will be useful, but WITHOUT ANY WARRANTY; -* without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -* License for more details. +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with The Inventra Controller Driver for Linux ; if not, -* write to the Free Software Foundation, Inc., 59 Temple Place, -* Suite 330, Boston, MA 02111-1307 USA +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA +* +* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN +* NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, +* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * -* ANY DOWNLOAD, USE, REPRODUCTION, MODIFICATION OR DISTRIBUTION -* OF THIS DRIVER INDICATES YOUR COMPLETE AND UNCONDITIONAL ACCEPTANCE -* OF THOSE TERMS.THIS DRIVER IS PROVIDED "AS IS" AND MENTOR GRAPHICS -* MAKES NO WARRANTIES, EXPRESS OR IMPLIED, RELATED TO THIS DRIVER. -* MENTOR GRAPHICS SPECIFICALLY DISCLAIMS ALL IMPLIED WARRANTIES -* OF MERCHANTABILITY; FITNESS FOR A PARTICULAR PURPOSE AND -* NON-INFRINGEMENT. MENTOR GRAPHICS DOES NOT PROVIDE SUPPORT -* SERVICES OR UPDATES FOR THIS DRIVER, EVEN IF YOU ARE A MENTOR -* GRAPHICS SUPPORT CUSTOMER. -******************************************************************/ +*/ #ifndef __MUSB_LINUX_DEBUG_H__#define __MUSB_LINUX_DEBUG_H__
drivers/usb/musb/dma.h +27 -26
62 lines not on this page · raw message
drivers/usb/musb/g_ep0.c +26 -25
61 lines not on this page · raw message
drivers/usb/musb/musb_gadget.c +26 -25
61 lines not on this page · raw message
drivers/usb/musb/musb_gadget.h +26 -25
61 lines not on this page · raw message
drivers/usb/musb/musb_host.c +26 -26
62 lines not on this page · raw message
drivers/usb/musb/musb_host.h +26 -25
61 lines not on this page · raw message
drivers/usb/musb/musb_procfs.c +26 -25
61 lines not on this page · raw message
drivers/usb/musb/musbdefs.h +26 -25
61 lines not on this page · raw message
drivers/usb/musb/musbhdrc.h +24 -23
58 lines not on this page · raw message
drivers/usb/musb/musbhsdma.c +25 -25
60 lines not on this page · raw message
drivers/usb/musb/plat_arc.h +25 -28
63 lines not on this page · raw message
drivers/usb/musb/plat_uds.c +26 -26
62 lines not on this page · raw message
drivers/usb/musb/virthub.c +26 -26
62 lines not on this page · raw message
Signature · 1 line
1.5.2.3
PATCH 2/36 _csr
Search and replace w[RT]xCsrVal with [rt]_csr
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 50 +++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 25 deletions(-)
drivers/usb/musb/musb_host.c +25 -25
@@ -1166,7 +1166,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) {int nPipe;u8 bDone = FALSE; -u16 wTxCsrVal; +u16 tx_csr;size_t wLength =0 ;u8 *pBuffer =NULL ;struct urb *pUrb;
@@ -1180,34 +1180,34 @@ void musb_host_tx(struct musb *musb, u8 epnum) pUrb =next_urb (qh);musb_ep_select (mbase, epnum); - wTxCsrVal =musb_readw (epio,MUSB_TXCSR ); + tx_csr =musb_readw (epio,MUSB_TXCSR );/* with CPPI, DMA sometimes triggers "extra" irqs */ if (!pUrb) { -DBG (4 ,"extra TX%d ready, csr %04x\n" , epnum, wTxCsrVal); +DBG (4 ,"extra TX%d ready, csr %04x\n" , epnum, tx_csr); goto finish; } nPipe = pUrb->pipe; dma =is_dma_capable () ? hw_ep->tx_channel :NULL ; -DBG (4 ,"OUT/TX%d end, csr %04x%s\n" , epnum, wTxCsrVal, +DBG (4 ,"OUT/TX%d end, csr %04x%s\n" , epnum, tx_csr, dma ?", dma" :"" );/* check for errors */ -if (wTxCsrVal &MUSB_TXCSR_H_RXSTALL ) { +if (tx_csr &MUSB_TXCSR_H_RXSTALL ) {/* dma was disabled, fifo flushed */ DBG (3 ,"TX end %d stall\n" , epnum);/* stall; record URB status */ status = -EPIPE ; - }else if (wTxCsrVal &MUSB_TXCSR_H_ERROR ) { + }else if (tx_csr &MUSB_TXCSR_H_ERROR ) {/* (NON-ISO) dma was disabled, fifo flushed */ DBG (3 ,"TX 3strikes on ep=%d\n" , epnum); status = -ETIMEDOUT ; - }else if (wTxCsrVal &MUSB_TXCSR_H_NAKTIMEOUT ) { + }else if (tx_csr &MUSB_TXCSR_H_NAKTIMEOUT ) {DBG (6 ,"TX end=%d device not responding\n" , epnum);/* NOTE: this code path would be a good place to PAUSE a
@@ -1234,7 +1234,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)* usb core; the dma engine should already be stopped. */ musb_h_tx_flush_fifo (hw_ep); - wTxCsrVal &= ~(MUSB_TXCSR_AUTOSET + tx_csr &= ~(MUSB_TXCSR_AUTOSET |MUSB_TXCSR_DMAENAB |MUSB_TXCSR_H_ERROR | MUSB_TXCSR_H_RXSTALL
@@ -1242,9 +1242,9 @@ void musb_host_tx(struct musb *musb, u8 epnum) );musb_ep_select (mbase, epnum); -musb_writew (epio,MUSB_TXCSR , wTxCsrVal); +musb_writew (epio,MUSB_TXCSR , tx_csr);/* REVISIT may need to clear FLUSHFIFO ... */ -musb_writew (epio,MUSB_TXCSR , wTxCsrVal); +musb_writew (epio,MUSB_TXCSR , tx_csr);musb_writeb (epio,MUSB_TXINTERVAL ,0 ); bDone = TRUE;
@@ -1252,7 +1252,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)/* second cppi case */ if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { -DBG (4 ,"extra TX%d ready, csr %04x\n" , epnum, wTxCsrVal); +DBG (4 ,"extra TX%d ready, csr %04x\n" , epnum, tx_csr); goto finish; }
@@ -1311,7 +1311,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) pUrb->actual_length = qh->offset;musb_advance_schedule (musb, pUrb, hw_ep,USB_DIR_OUT ); - }else if (!(wTxCsrVal &MUSB_TXCSR_DMAENAB )) { + }else if (!(tx_csr &MUSB_TXCSR_DMAENAB )) {// WARN_ON(!pBuffer); /* REVISIT: some docs say that when hw_ep->tx_double_buffered,
@@ -1386,7 +1386,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)size_t xfer_len;void __iomem *mbase = musb->mregs;int nPipe; -u16 wRxCsrVal, wVal; +u16 rx_csr, wVal;u8 bIsochError = FALSE;u8 bDone = FALSE;u32 status;
@@ -1399,7 +1399,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) status =0 ; xfer_len =0 ; - wVal = wRxCsrVal =musb_readw (epio,MUSB_RXCSR ); + wVal = rx_csr =musb_readw (epio,MUSB_RXCSR );if (unlikely (!pUrb)) {/* REVISIT -- THIS SHOULD NEVER HAPPEN ... but, at least
@@ -1415,24 +1415,24 @@ void musb_host_rx(struct musb *musb, u8 epnum) nPipe = pUrb->pipe;DBG (5 ,"<== hw %d rxcsr %04x, urb actual %d (+dma %zd)\n" , - epnum, wRxCsrVal, pUrb->actual_length, + epnum, rx_csr, pUrb->actual_length, dma ? dma->actual_len :0 );/* check for errors, concurrent stall & unlink is not really * handled yet! */ -if (wRxCsrVal &MUSB_RXCSR_H_RXSTALL ) { +if (rx_csr &MUSB_RXCSR_H_RXSTALL ) {DBG (3 ,"RX end %d STALL\n" , epnum);/* stall; record URB status */ status = -EPIPE ; - }else if (wRxCsrVal &MUSB_RXCSR_H_ERROR ) { + }else if (rx_csr &MUSB_RXCSR_H_ERROR ) {DBG (3 ,"end %d RX proto error\n" , epnum); status = -EPROTO ;musb_writeb (epio,MUSB_RXINTERVAL ,0 ); - }else if (wRxCsrVal &MUSB_RXCSR_DATAERROR ) { + }else if (rx_csr &MUSB_RXCSR_DATAERROR ) {if (USB_ENDPOINT_XFER_ISOC != qh->type) {/* NOTE this code path would be a good place to PAUSE a
@@ -1472,7 +1472,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)if (unlikely (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY )) {/* SHOULD NEVER HAPPEN ... but at least DaVinci has done it */ -ERR ("RX%d dma busy, csr %04x\n" , epnum, wRxCsrVal); +ERR ("RX%d dma busy, csr %04x\n" , epnum, rx_csr); goto finish; }
@@ -1484,7 +1484,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)/* FIXME this is _way_ too much in-line logic for Mentor DMA */ #ifndef CONFIG_USB_INVENTRA_DMA -if (wRxCsrVal &MUSB_RXCSR_H_REQPKT ) { +if (rx_csr &MUSB_RXCSR_H_REQPKT ) {/* REVISIT this happened for a while on some short reads... * the cleanup still needs investigation... looks bad... * and also duplicates dma cleanup code above ... plus,
@@ -1497,16 +1497,16 @@ void musb_host_rx(struct musb *musb, u8 epnum) bDone = TRUE; } -DBG (2 ,"RXCSR%d %04x, reqpkt, len %zd%s\n" , epnum, wRxCsrVal, +DBG (2 ,"RXCSR%d %04x, reqpkt, len %zd%s\n" , epnum, rx_csr, xfer_len, dma ?", dma" :"" ); - wRxCsrVal &= ~MUSB_RXCSR_H_REQPKT ; + rx_csr &= ~MUSB_RXCSR_H_REQPKT ;musb_ep_select (mbase, epnum);musb_writew (epio,MUSB_RXCSR , -MUSB_RXCSR_H_WZC_BITS | wRxCsrVal); +MUSB_RXCSR_H_WZC_BITS | rx_csr); }#endif -if (dma && (wRxCsrVal &MUSB_RXCSR_DMAENAB )) { +if (dma && (rx_csr &MUSB_RXCSR_DMAENAB )) { xfer_len = dma->actual_len; wVal &= ~(MUSB_RXCSR_DMAENAB
@@ -1537,7 +1537,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)#endif }else if (pUrb->status == -EINPROGRESS ) {/* if no errors, be sure a packet is ready for unloading */ -if (unlikely (!(wRxCsrVal &MUSB_RXCSR_RXPKTRDY ))) { +if (unlikely (!(rx_csr &MUSB_RXCSR_RXPKTRDY ))) { status = -EPROTO ;ERR ("Rx interrupt with no errors or packet!\n" );
Signature · 1 line
1.5.2.3
PATCH 3/36 musb_hdrc: Search and replace wCsr with csr
Search and replace wCsr with csr. Also manually
fix remaining RxCsr comments.
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_gadget.c | 56 +++++++++++++++++++------------------- drivers/usb/musb/musb_host.c | 58 ++++++++++++++++++++-------------------- drivers/usb/musb/musbhsdma.c | 20 +++++++------- 3 files changed, 67 insertions(+), 67 deletions(-)
drivers/usb/musb/musb_gadget.c +28 -28
@@ -622,7 +622,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) c = musb->dma_controller; channel = musb_ep->dma; -/* We use DMA Req mode 0 in RxCsr, and DMA controller operates in +/* We use DMA Req mode 0 in rx_csr, and DMA controller operates in * mode 0 only. So we do not get endpoint interrupts due to DMA * completion. We only get interrupts from DMA controller. *
@@ -635,7 +635,7 @@ static void rxstate(struct musb *musb, struct musb_request *req)* that last pckate should trigger an overflow fault.) But in mode 1, * we don't get DMA completion interrrupt for short packets. * -* Theoretically, we could enable DMAReq interrupt (RxCsr_DMAMODE = 1), +* Theoretically, we could enable DMAReq interrupt (MUSB_RXCSR_DMAMODE = 1), * to get endpoint interrupt on every DMA req, but that didn't seem * to work reliably. *
@@ -1235,7 +1235,7 @@ int musb_gadget_set_halt(struct usb_ep *ep, int value)void __iomem *epio = musb->endpoints[epnum].regs;void __iomem *mbase;unsigned long flags; -u16 wCsr; +u16 csr;struct musb_request *request =NULL ;int status =0 ;
@@ -1255,8 +1255,8 @@ int musb_gadget_set_halt(struct usb_ep *ep, int value)/* cannot portably stall with non-empty FIFO */ request =to_musb_request (next_request (musb_ep));if (value && musb_ep->is_in) { - wCsr =musb_readw (epio,MUSB_TXCSR ); -if (wCsr &MUSB_TXCSR_FIFONOTEMPTY ) { + csr =musb_readw (epio,MUSB_TXCSR ); +if (csr &MUSB_TXCSR_FIFONOTEMPTY ) {DBG (3 ,"%s fifo busy, cannot halt\n" , ep->name);spin_unlock_irqrestore (&musb->lock, flags);return -EAGAIN ;
@@ -1267,29 +1267,29 @@ int musb_gadget_set_halt(struct usb_ep *ep, int value)/* set/clear the stall and toggle bits */ DBG (2 ,"%s: %s stall\n" , ep->name, value ?"set" :"clear" );if (musb_ep->is_in) { - wCsr =musb_readw (epio,MUSB_TXCSR ); -if (wCsr &MUSB_TXCSR_FIFONOTEMPTY ) - wCsr |=MUSB_TXCSR_FLUSHFIFO ; - wCsr |=MUSB_TXCSR_P_WZC_BITS + csr =musb_readw (epio,MUSB_TXCSR ); +if (csr &MUSB_TXCSR_FIFONOTEMPTY ) + csr |=MUSB_TXCSR_FLUSHFIFO ; + csr |=MUSB_TXCSR_P_WZC_BITS |MUSB_TXCSR_CLRDATATOG ;if (value) - wCsr |=MUSB_TXCSR_P_SENDSTALL ; + csr |=MUSB_TXCSR_P_SENDSTALL ;else - wCsr &= ~(MUSB_TXCSR_P_SENDSTALL + csr &= ~(MUSB_TXCSR_P_SENDSTALL |MUSB_TXCSR_P_SENTSTALL ); - wCsr &= ~MUSB_TXCSR_TXPKTRDY ; -musb_writew (epio,MUSB_TXCSR , wCsr); + csr &= ~MUSB_TXCSR_TXPKTRDY ; +musb_writew (epio,MUSB_TXCSR , csr); }else { - wCsr =musb_readw (epio,MUSB_RXCSR ); - wCsr |=MUSB_RXCSR_P_WZC_BITS + csr =musb_readw (epio,MUSB_RXCSR ); + csr |=MUSB_RXCSR_P_WZC_BITS |MUSB_RXCSR_FLUSHFIFO |MUSB_RXCSR_CLRDATATOG ;if (value) - wCsr |=MUSB_RXCSR_P_SENDSTALL ; + csr |=MUSB_RXCSR_P_SENDSTALL ;else - wCsr &= ~(MUSB_RXCSR_P_SENDSTALL + csr &= ~(MUSB_RXCSR_P_SENDSTALL |MUSB_RXCSR_P_SENTSTALL ); -musb_writew (epio,MUSB_RXCSR , wCsr); +musb_writew (epio,MUSB_RXCSR , csr); } done:
@@ -1335,7 +1335,7 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep)void __iomem *epio = musb->endpoints[nEnd].regs;void __iomem *mbase;unsigned long flags; -u16 wCsr, wIntrTxE; +u16 csr, wIntrTxE; mbase = musb->mregs;
@@ -1347,18 +1347,18 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep)musb_writew (mbase,MUSB_INTRTXE , wIntrTxE & ~(1 << nEnd));if (musb_ep->is_in) { - wCsr =musb_readw (epio,MUSB_TXCSR ); -if (wCsr &MUSB_TXCSR_FIFONOTEMPTY ) { - wCsr |=MUSB_TXCSR_FLUSHFIFO |MUSB_TXCSR_P_WZC_BITS ; -musb_writew (epio,MUSB_TXCSR , wCsr); + csr =musb_readw (epio,MUSB_TXCSR ); +if (csr &MUSB_TXCSR_FIFONOTEMPTY ) { + csr |=MUSB_TXCSR_FLUSHFIFO |MUSB_TXCSR_P_WZC_BITS ; +musb_writew (epio,MUSB_TXCSR , csr);/* REVISIT may be inappropriate w/o FIFONOTEMPTY ... */ -musb_writew (epio,MUSB_TXCSR , wCsr); +musb_writew (epio,MUSB_TXCSR , csr); } }else { - wCsr =musb_readw (epio,MUSB_RXCSR ); - wCsr |=MUSB_RXCSR_FLUSHFIFO |MUSB_RXCSR_P_WZC_BITS ; -musb_writew (epio,MUSB_RXCSR , wCsr); -musb_writew (epio,MUSB_RXCSR , wCsr); + csr =musb_readw (epio,MUSB_RXCSR ); + csr |=MUSB_RXCSR_FLUSHFIFO |MUSB_RXCSR_P_WZC_BITS ; +musb_writew (epio,MUSB_RXCSR , csr); +musb_writew (epio,MUSB_RXCSR , csr); }/* re-enable interrupt */
drivers/usb/musb/musb_host.c +29 -29
140 lines not on this page · raw message
drivers/usb/musb/musbhsdma.c +10 -10
@@ -179,29 +179,29 @@ static void configure_channel(struct dma_channel *pChannel,struct musb_dma_controller *pController = pImplChannel->pController;u8 *mbase = pController->pCoreBase;u8 bChannel = pImplChannel->bIndex; -u16 wCsr =0 ; +u16 csr =0 ;DBG (4 ,"%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n" , pChannel, packet_sz, dma_addr, dwLength, mode);if (mode) { - wCsr |=1 <<MUSB_HSDMA_MODE1_SHIFT ; + csr |=1 <<MUSB_HSDMA_MODE1_SHIFT ;if (dwLength < packet_sz) {return FALSE; }if (packet_sz >=64 ) { - wCsr |= + csr |=MGC_HSDMA_BURSTMODE_INCR16 <<MUSB_HSDMA_BURSTMODE_SHIFT ; }else if (packet_sz >=32 ) { - wCsr |= + csr |=MGC_HSDMA_BURSTMODE_INCR8 <<MUSB_HSDMA_BURSTMODE_SHIFT ; }else if (packet_sz >=16 ) { - wCsr |= + csr |=MGC_HSDMA_BURSTMODE_INCR4 <<MUSB_HSDMA_BURSTMODE_SHIFT ; } } - wCsr |= (pImplChannel->epnum <<MUSB_HSDMA_ENDPOINT_SHIFT ) + csr |= (pImplChannel->epnum <<MUSB_HSDMA_ENDPOINT_SHIFT ) | (1 <<MUSB_HSDMA_ENABLE_SHIFT ) | (1 <<MUSB_HSDMA_IRQENABLE_SHIFT ) | (pImplChannel->bTransmit ? (1 <<MUSB_HSDMA_TRANSMIT_SHIFT ) :0 );
@@ -217,7 +217,7 @@ static void configure_channel(struct dma_channel *pChannel,/* control (this should start things) */ musb_writew (mbase,MGC_HSDMA_CHANNEL_OFFSET (bChannel,MGC_O_HSDMA_CONTROL ), - wCsr); + csr); } static int dma_channel_program(struct dma_channel * pChannel,
@@ -302,7 +302,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)u8 *mbase = pController->pCoreBase;struct dma_channel *pChannel;u8 bChannel; -u16 wCsr; +u16 csr;u32 dwAddress;u8 bIntr;irqreturn_t retval =IRQ_NONE ;
@@ -317,11 +317,11 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data) &(pController->aChannel[bChannel]); pChannel = &pImplChannel->Channel; - wCsr =musb_readw (mbase, + csr =musb_readw (mbase,MGC_HSDMA_CHANNEL_OFFSET (bChannel,MGC_O_HSDMA_CONTROL )); -if (wCsr & (1 <<MUSB_HSDMA_BUSERROR_SHIFT )) { +if (csr & (1 <<MUSB_HSDMA_BUSERROR_SHIFT )) { pImplChannel->Channel.status =MGC_DMA_STATUS_BUS_ABORT ; }else {
Signature · 1 line
1.5.2.3
PATCH 4/36 xe
Search and replace wIntr[RT]xE with int_[rt]xe
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_gadget.c | 32 ++++++++++++++++---------------- drivers/usb/musb/musb_host.c | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-)
drivers/usb/musb/musb_gadget.c +16 -16
@@ -895,7 +895,7 @@ static int musb_gadget_enable(struct usb_ep *ep,*/ musb_ep_select (mbase, epnum);if (desc->bEndpointAddress &USB_DIR_IN ) { -u16 wIntrTxE =musb_readw (mbase,MUSB_INTRTXE ); +u16 int_txe =musb_readw (mbase,MUSB_INTRTXE );if (hw_ep->is_shared_fifo) musb_ep->is_in =1 ;
@@ -904,8 +904,8 @@ static int musb_gadget_enable(struct usb_ep *ep,if (tmp > hw_ep->max_packet_sz_tx) goto fail; - wIntrTxE |= (1 << epnum); -musb_writew (mbase,MUSB_INTRTXE , wIntrTxE); + int_txe |= (1 << epnum); +musb_writew (mbase,MUSB_INTRTXE , int_txe);/* REVISIT if can_bulk_split(), use by updating "tmp"; * likewise high bandwidth periodic tx
@@ -925,7 +925,7 @@ static int musb_gadget_enable(struct usb_ep *ep,musb_writew (regs,MUSB_TXCSR , csr); }else { -u16 wIntrRxE =musb_readw (mbase,MUSB_INTRRXE ); +u16 int_rxe =musb_readw (mbase,MUSB_INTRRXE );if (hw_ep->is_shared_fifo) musb_ep->is_in =0 ;
@@ -934,8 +934,8 @@ static int musb_gadget_enable(struct usb_ep *ep,if (tmp > hw_ep->max_packet_sz_rx) goto fail; - wIntrRxE |= (1 << epnum); -musb_writew (mbase,MUSB_INTRRXE , wIntrRxE); + int_rxe |= (1 << epnum); +musb_writew (mbase,MUSB_INTRRXE , int_rxe);/* REVISIT if can_bulk_combine() use by updating "tmp" * likewise high bandwidth periodic rx
@@ -1015,14 +1015,14 @@ static int musb_gadget_disable(struct usb_ep *ep)/* zero the endpoint sizes */ if (musb_ep->is_in) { -u16 wIntrTxE =musb_readw (musb->mregs,MUSB_INTRTXE ); - wIntrTxE &= ~(1 << epnum); -musb_writew (musb->mregs,MUSB_INTRTXE , wIntrTxE); +u16 int_txe =musb_readw (musb->mregs,MUSB_INTRTXE ); + int_txe &= ~(1 << epnum); +musb_writew (musb->mregs,MUSB_INTRTXE , int_txe);musb_writew (epio,MUSB_TXMAXP ,0 ); }else { -u16 wIntrRxE =musb_readw (musb->mregs,MUSB_INTRRXE ); - wIntrRxE &= ~(1 << epnum); -musb_writew (musb->mregs,MUSB_INTRRXE , wIntrRxE); +u16 int_rxe =musb_readw (musb->mregs,MUSB_INTRRXE ); + int_rxe &= ~(1 << epnum); +musb_writew (musb->mregs,MUSB_INTRRXE , int_rxe);musb_writew (epio,MUSB_RXMAXP ,0 ); }
@@ -1335,7 +1335,7 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep)void __iomem *epio = musb->endpoints[nEnd].regs;void __iomem *mbase;unsigned long flags; -u16 csr, wIntrTxE; +u16 csr, int_txe; mbase = musb->mregs;
@@ -1343,8 +1343,8 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep)musb_ep_select (mbase, (u8 ) nEnd);/* disable interrupts */ - wIntrTxE =musb_readw (mbase,MUSB_INTRTXE ); -musb_writew (mbase,MUSB_INTRTXE , wIntrTxE & ~(1 << nEnd)); + int_txe =musb_readw (mbase,MUSB_INTRTXE ); +musb_writew (mbase,MUSB_INTRTXE , int_txe & ~(1 << nEnd));if (musb_ep->is_in) { csr =musb_readw (epio,MUSB_TXCSR );
@@ -1362,7 +1362,7 @@ static void musb_gadget_fifo_flush(struct usb_ep *ep) }/* re-enable interrupt */ -musb_writew (mbase,MUSB_INTRTXE , wIntrTxE); +musb_writew (mbase,MUSB_INTRTXE , int_txe);spin_unlock_irqrestore (&musb->lock, flags); }
drivers/usb/musb/musb_host.c +4 -4
@@ -673,14 +673,14 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* OUT/transmit/EP0 or IN/receive? */ if (is_out) {u16 csr; -u16 wIntrTxE; +u16 int_txe;u16 wLoadCount; csr =musb_readw (epio,MUSB_TXCSR );/* disable interrupt in case we flush */ - wIntrTxE =musb_readw (mbase,MUSB_INTRTXE ); -musb_writew (mbase,MUSB_INTRTXE , wIntrTxE & ~(1 << epnum)); + int_txe =musb_readw (mbase,MUSB_INTRTXE ); +musb_writew (mbase,MUSB_INTRTXE , int_txe & ~(1 << epnum));/* general endpoint setup */ if (epnum) {
@@ -868,7 +868,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, }/* re-enable interrupt */ -musb_writew (mbase,MUSB_INTRTXE , wIntrTxE); +musb_writew (mbase,MUSB_INTRTXE , int_txe);/* IN/receive */ }else {
Signature · 1 line
1.5.2.3
PATCH 5/36 musb_hdrc: Search and replace bIntrUSB with int_usb
Search and replace bIntrUSB with int_usb
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/plat_uds.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/usb/musb/plat_uds.c +14 -14
@@ -351,7 +351,7 @@ void musb_hnp_stop(struct musb *musb)* the order of the tests is specified in the manual * * @param musb instance pointer -* @param bIntrUSB register contents +* @param int_usb register contents * @param devctl * @param power */
@@ -360,7 +360,7 @@ void musb_hnp_stop(struct musb *musb) | MUSB_INTR_VBUSERROR | MUSB_INTR_CONNECT \ | MUSB_INTR_RESET ) -static irqreturn_t musb_stage0_irq (struct musb * musb,u8 bIntrUSB, +static irqreturn_t musb_stage0_irq (struct musb * musb,u8 int_usb,u8 devctl,u8 power) {irqreturn_t handled =IRQ_NONE ;
@@ -368,14 +368,14 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,void __iomem *mbase = musb->mregs;#endif -DBG (3 ,"<== Power=%02x, DevCtl=%02x, bIntrUSB=0x%x\n" , power, devctl, - bIntrUSB); +DBG (3 ,"<== Power=%02x, DevCtl=%02x, int_usb=0x%x\n" , power, devctl, + int_usb);/* in host mode, the peripheral may issue remote wakeup. * in peripheral mode, the host may resume the link. * spurious RESUME irqs happen too, paired with SUSPEND. */ -if (bIntrUSB &MUSB_INTR_RESUME ) { +if (int_usb &MUSB_INTR_RESUME ) { handled =IRQ_HANDLED ;DBG (3 ,"RESUME (%s)\n" ,otg_state_string (musb));
@@ -456,7 +456,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,#ifdef CONFIG_USB_MUSB_HDRC_HCD /* see manual for the order of the tests */ -if (bIntrUSB &MUSB_INTR_SESSREQ ) { +if (int_usb &MUSB_INTR_SESSREQ ) {DBG (1 ,"SESSION_REQUEST (%s)\n" ,otg_state_string (musb));/* IRQ arrives from ID pin sense or (later, if VBUS power
@@ -475,7 +475,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB, handled =IRQ_HANDLED ; } -if (bIntrUSB &MUSB_INTR_VBUSERROR ) { +if (int_usb &MUSB_INTR_VBUSERROR ) {int ignore =0 ;/* During connection as an A-Device, we may see a short
@@ -543,7 +543,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB, handled =IRQ_HANDLED ; } -if (bIntrUSB &MUSB_INTR_CONNECT ) { +if (int_usb &MUSB_INTR_CONNECT ) {struct usb_hcd *hcd =musb_to_hcd (musb); handled =IRQ_HANDLED ;
@@ -603,7 +603,7 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,/* mentor saves a bit: bus reset and babble share the same irq. * only host sees babble; only peripheral sees bus reset. */ -if (bIntrUSB &MUSB_INTR_RESET ) { +if (int_usb &MUSB_INTR_RESET ) {if (devctl &MUSB_DEVCTL_HM ) {/* * Looks like non-HS BABBLE can be ignored, but
@@ -638,11 +638,11 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 bIntrUSB,* the order of the tests is specified in the manual * * @param musb instance pointer -* @param bIntrUSB register contents +* @param int_usb register contents * @param devctl * @param power */ -static irqreturn_t musb_stage2_irq (struct musb * musb,u8 bIntrUSB, +static irqreturn_t musb_stage2_irq (struct musb * musb,u8 int_usb,u8 devctl,u8 power) {irqreturn_t handled =IRQ_NONE ;
@@ -659,7 +659,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,* endpoints, relies on TX/RX interval registers, and isn't claimed * to support ISO transfers yet. */ -if (bIntrUSB &MUSB_INTR_SOF ) { +if (int_usb &MUSB_INTR_SOF ) {void __iomem *mbase = musb->mregs;struct musb_hw_ep *ep;u8 epnum;
@@ -690,7 +690,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB, }#endif -if ((bIntrUSB &MUSB_INTR_DISCONNECT ) && !musb->ignore_disconnect) { +if ((int_usb &MUSB_INTR_DISCONNECT ) && !musb->ignore_disconnect) {DBG (1 ,"DISCONNECT (%s) as %s, devctl %02x\n" ,otg_state_string (musb),MUSB_MODE (musb), devctl);
@@ -731,7 +731,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 bIntrUSB,schedule_work (&musb->irq_work); } -if (bIntrUSB &MUSB_INTR_SUSPEND ) { +if (int_usb &MUSB_INTR_SUSPEND ) {DBG (1 ,"SUSPEND (%s) devctl %02x power %02x\n" ,otg_state_string (musb), devctl, power); handled =IRQ_HANDLED ;
Signature · 1 line
1.5.2.3
PATCH 6/36 musb_hdrc: Search and replace bIntr with int_hsdma
Search and replace bIntr with int_hsdma
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musbhsdma.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/usb/musb/musbhsdma.c +4 -4
@@ -304,15 +304,15 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)u8 bChannel;u16 csr;u32 dwAddress; -u8 bIntr; +u8 int_hsdma;irqreturn_t retval =IRQ_NONE ; - bIntr =musb_readb (mbase,MGC_O_HSDMA_INTR ); -if (!bIntr) + int_hsdma =musb_readb (mbase,MGC_O_HSDMA_INTR ); +if (!int_hsdma) goto done;for (bChannel =0 ; bChannel <MGC_HSDMA_CHANNELS ; bChannel++) { -if (bIntr & (1 << bChannel)) { +if (int_hsdma & (1 << bChannel)) { pImplChannel = (struct musb_dma_channel *) &(pController->aChannel[bChannel]); pChannel = &pImplChannel->Channel;
Signature · 1 line
1.5.2.3
PATCH 7/36 musb_hdrc: Search and replace bTransmit with transmit
Search and replace bTransmit with transmit
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/cppi_dma.c | 26 +++++++++++++------------- drivers/usb/musb/cppi_dma.h | 2 +- drivers/usb/musb/dma.h | 2 +- drivers/usb/musb/musbhsdma.c | 18 +++++++++--------- drivers/usb/musb/plat_uds.c | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-)
drivers/usb/musb/cppi_dma.c +13 -13
@@ -147,11 +147,11 @@ static int __init cppi_controller_start(struct dma_controller *c)/* do whatever is necessary to start controller */ for (i =0 ; i <ARRAY_SIZE (pController->txCppi); i++) { - pController->txCppi[i].bTransmit = TRUE; + pController->txCppi[i].transmit = TRUE; pController->txCppi[i].chNo = i; }for (i =0 ; i <ARRAY_SIZE (pController->rxCppi); i++) { - pController->rxCppi[i].bTransmit = FALSE; + pController->rxCppi[i].transmit = FALSE; pController->rxCppi[i].chNo = i; }
@@ -283,7 +283,7 @@ static inline void core_rxirq_enable(void __iomem *tibase, unsigned epnum)static struct dma_channel *cppi_channel_allocate (struct dma_controller *c,struct musb_hw_ep *ep, -u8 bTransmit) +u8 transmit) {struct cppi *pController;u8 chNum;
@@ -300,7 +300,7 @@ cppi_channel_allocate(struct dma_controller *c,/* return the corresponding CPPI Channel Handle, and * probably disable the non-CPPI irq until we need it. */ -if (bTransmit) { +if (transmit) {if (local_end >ARRAY_SIZE (pController->txCppi)) {DBG (1 ,"no %cX DMA channel for ep%d\n" ,'T' , local_end);return NULL ;
@@ -320,11 +320,11 @@ cppi_channel_allocate(struct dma_controller *c,*/ if (otgCh->hw_ep)DBG (1 ,"re-allocating DMA%d %cX channel %p\n" , - chNum, bTransmit ?'T' :'R' , otgCh); + chNum, transmit ?'T' :'R' , otgCh); otgCh->hw_ep = ep; otgCh->Channel.status =MGC_DMA_STATUS_FREE ; -DBG (4 ,"Allocate CPPI%d %cX\n" , chNum, bTransmit ?'T' :'R' ); +DBG (4 ,"Allocate CPPI%d %cX\n" , chNum, transmit ?'T' :'R' ); otgCh->Channel.private_data = otgCh;return &otgCh->Channel; }
@@ -343,7 +343,7 @@ static void cppi_channel_release(struct dma_channel *channel) tibase = c->pController->pCoreBase -DAVINCI_BASE_OFFSET ;if (!c->hw_ep)DBG (1 ,"releasing idle DMA channel %p\n" , c); -else if (!c->bTransmit) +else if (!c->transmit)core_rxirq_enable (tibase, epnum);/* for now, leave its cppi IRQ enabled (we won't trigger it) */
@@ -962,19 +962,19 @@ static int cppi_channel_program(struct dma_channel *pChannel,case MGC_DMA_STATUS_CORE_ABORT :/* fault irq handler should have handled cleanup */ WARN ("%cX DMA%d not cleaned up after abort!\n" , - otgChannel->bTransmit ?'T' :'R' , + otgChannel->transmit ?'T' :'R' , otgChannel->chNo);//WARN_ON(1); break ;case MGC_DMA_STATUS_BUSY :WARN ("program active channel? %cX DMA%d\n" , - otgChannel->bTransmit ?'T' :'R' , + otgChannel->transmit ?'T' :'R' , otgChannel->chNo);//WARN_ON(1); break ;case MGC_DMA_STATUS_UNKNOWN :DBG (1 ,"%cX DMA%d not allocated!\n" , - otgChannel->bTransmit ?'T' :'R' , + otgChannel->transmit ?'T' :'R' , otgChannel->chNo);/* FALLTHROUGH */ case MGC_DMA_STATUS_FREE :
@@ -991,7 +991,7 @@ static int cppi_channel_program(struct dma_channel *pChannel, otgChannel->transferSize = dwLength;/* TX channel? or RX? */ -if (otgChannel->bTransmit) +if (otgChannel->transmit)cppi_next_tx_segment (musb, otgChannel);else cppi_next_rx_segment (musb, otgChannel, mode);
@@ -1390,7 +1390,7 @@ static int cppi_channel_abort(struct dma_channel *channel)return -EINVAL ; } -if (!otgCh->bTransmit && otgCh->activeQueueHead) +if (!otgCh->transmit && otgCh->activeQueueHead)cppi_dump_rxq (3 ,"/abort" , otgCh); mbase = pController->pCoreBase;
@@ -1406,7 +1406,7 @@ static int cppi_channel_abort(struct dma_channel *channel)*/ musb_ep_select (mbase, chNum +1 ); -if (otgCh->bTransmit) { +if (otgCh->transmit) {struct cppi_tx_stateram *__iomem txState;int enabled;
drivers/usb/musb/cppi_dma.h +1 -1
@@ -66,7 +66,7 @@ struct cppi_channel {/* which direction of which endpoint? */ struct musb_hw_ep *hw_ep; -u8 bTransmit; +u8 transmit;u8 chNo;/* DMA modes: RNDIS or "transparent" */
drivers/usb/musb/dma.h +1 -1
@@ -181,7 +181,7 @@ struct dma_controller { };/* called after channel_program(), may indicate a fault */ -extern void musb_dma_completion (struct musb *musb,u8 epnum,u8 bTransmit); +extern void musb_dma_completion (struct musb *musb,u8 epnum,u8 transmit); extern struct dma_controller *__init
drivers/usb/musb/musbhsdma.c +9 -9
@@ -79,7 +79,7 @@ struct musb_dma_channel {u16 wMaxPacketSize;u8 bIndex;u8 epnum; -u8 bTransmit; +u8 transmit; };struct musb_dma_controller {
@@ -126,7 +126,7 @@ static int dma_controller_stop(struct dma_controller *c) }static struct dma_channel *dma_channel_allocate (struct dma_controller *c, -struct musb_hw_ep *hw_ep,u8 bTransmit) +struct musb_hw_ep *hw_ep,u8 transmit) {u8 bBit;struct dma_channel *pChannel =NULL ;
@@ -141,13 +141,13 @@ static struct dma_channel* dma_channel_allocate(struct dma_controller *c, pImplChannel->pController = pController; pImplChannel->bIndex = bBit; pImplChannel->epnum = hw_ep->epnum; - pImplChannel->bTransmit = bTransmit; + pImplChannel->transmit = transmit; pChannel = &(pImplChannel->Channel); pChannel->private_data = pImplChannel; pChannel->status =MGC_DMA_STATUS_FREE ; pChannel->max_len =0x10000 ;/* Tx => mode 1; Rx => mode 0 */ - pChannel->desired_mode = bTransmit; + pChannel->desired_mode = transmit; pChannel->actual_len =0 ;break ; }
@@ -204,7 +204,7 @@ static void configure_channel(struct dma_channel *pChannel, csr |= (pImplChannel->epnum <<MUSB_HSDMA_ENDPOINT_SHIFT ) | (1 <<MUSB_HSDMA_ENABLE_SHIFT ) | (1 <<MUSB_HSDMA_IRQENABLE_SHIFT ) - | (pImplChannel->bTransmit ? (1 <<MUSB_HSDMA_TRANSMIT_SHIFT ) :0 ); + | (pImplChannel->transmit ? (1 <<MUSB_HSDMA_TRANSMIT_SHIFT ) :0 );/* address/count */ musb_writel(mbase,
@@ -229,7 +229,7 @@ static int dma_channel_program(struct dma_channel * pChannel,DBG (2 ,"ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n" , pImplChannel->epnum, - pImplChannel->bTransmit ?"Tx" :"Rx" , + pImplChannel->transmit ?"Tx" :"Rx" , packet_sz, dma_addr, dwLength, mode); BUG_ON(pChannel->status == MGC_DMA_STATUS_UNKNOWN ||
@@ -260,7 +260,7 @@ static int dma_channel_abort(struct dma_channel *pChannel)u16 csr;if (pChannel->status ==MGC_DMA_STATUS_BUSY ) { -if (pImplChannel->bTransmit) { +if (pImplChannel->transmit) { csr =musb_readw (mbase,MGC_END_OFFSET (pImplChannel->epnum,MUSB_TXCSR ));
@@ -347,7 +347,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)/* completed */ if ((devctl &MUSB_DEVCTL_HM ) - && (pImplChannel->bTransmit) + && (pImplChannel->transmit) && ((pChannel->desired_mode ==0 ) || (pChannel->actual_len & (pImplChannel->wMaxPacketSize - 1)))
@@ -362,7 +362,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)musb_dma_completion ( pController->pDmaPrivate, pImplChannel->epnum, - pImplChannel->bTransmit); + pImplChannel->transmit); } } }
drivers/usb/musb/plat_uds.c +2 -2
@@ -1539,7 +1539,7 @@ 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 epnum,u8 bTransmit) +void musb_dma_completion (struct musb *musb,u8 epnum,u8 transmit) {u8 devctl =musb_readb (musb->mregs,MUSB_DEVCTL );
@@ -1557,7 +1557,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 bTransmit)#endif }else {/* endpoints 1..15 */ -if (bTransmit) { +if (transmit) {if (devctl &MUSB_DEVCTL_HM ) {if (is_host_capable ())musb_host_tx (musb, epnum);
Signature · 1 line
1.5.2.3
PATCH 8/36 musb_hdrc: Search and replace pUrb with urb
Search and replace pUrb with urb
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 190 +++++++++++++++++++++--------------------- 1 files changed, 95 insertions(+), 95 deletions(-)
drivers/usb/musb/musb_host.c +95 -95
@@ -104,7 +104,7 @@/*************************** Forwards ***************************/ static void musb_ep_program (struct musb *musb,u8 epnum, -struct urb *pUrb,unsigned int nOut, +struct urb *urb,unsigned int nOut,u8 * pBuffer,u32 dwLength);/*
@@ -466,7 +466,7 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)/* * PIO RX for a packet (or part of it). */ -static u8 musb_host_packet_rx (struct musb *musb,struct urb *pUrb, +static u8 musb_host_packet_rx (struct musb *musb,struct urb *urb,u8 epnum,u8 bIsochError) {u16 wRxCount;
@@ -478,14 +478,14 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *pUrb,struct musb_hw_ep *hw_ep = musb->endpoints + epnum;void __iomem *epio = hw_ep->regs;struct musb_qh *qh = hw_ep->in_qh; -int nPipe = pUrb->pipe; -void *buffer = pUrb->transfer_buffer; +int nPipe = urb->pipe; +void *buffer = urb->transfer_buffer;// musb_ep_select(mbase, epnum); wRxCount =musb_readw (epio,MUSB_RXCOUNT );DBG (3 ,"RX%d count %d, buffer %p len %d/%d\n" , epnum, wRxCount, - pUrb->transfer_buffer, qh->offset, - pUrb->transfer_buffer_length); + urb->transfer_buffer, qh->offset, + urb->transfer_buffer_length);/* unload FIFO */ if (usb_pipeisoc (nPipe)) {
@@ -494,52 +494,52 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *pUrb,if (bIsochError) { status = -EILSEQ ; - pUrb->error_count++; + urb->error_count++; } - d = pUrb->iso_frame_desc + qh->iso_idx; + d = urb->iso_frame_desc + qh->iso_idx; pBuffer = buffer + d->offset; length = d->length;if (wRxCount > length) {if (status ==0 ) { status = -EOVERFLOW ; - pUrb->error_count++; + urb->error_count++; }DBG (2 ,"** OVERFLOW %d into %d\n" , wRxCount, length); do_flush =1 ; }else length = wRxCount; - pUrb->actual_length += length; + urb->actual_length += length; d->actual_length = length; d->status = status;/* see if we are done */ - bDone = (++qh->iso_idx >= pUrb->number_of_packets); + bDone = (++qh->iso_idx >= urb->number_of_packets); }else {/* non-isoch */ pBuffer = buffer + qh->offset; - length = pUrb->transfer_buffer_length - qh->offset; + length = urb->transfer_buffer_length - qh->offset;if (wRxCount > length) { -if (pUrb->status == -EINPROGRESS ) - pUrb->status = -EOVERFLOW ; +if (urb->status == -EINPROGRESS ) + urb->status = -EOVERFLOW ;DBG (2 ,"** OVERFLOW %d into %d\n" , wRxCount, length); do_flush =1 ; }else length = wRxCount; - pUrb->actual_length += length; + urb->actual_length += length; qh->offset += length;/* see if we are done */ - bDone = (pUrb->actual_length == pUrb->transfer_buffer_length) + bDone = (urb->actual_length == urb->transfer_buffer_length) || (wRxCount < qh->maxpacket) - || (pUrb->status != -EINPROGRESS ); + || (urb->status != -EINPROGRESS );if (bDone - && (pUrb->status == -EINPROGRESS ) - && (pUrb->transfer_flags &URB_SHORT_NOT_OK ) - && (pUrb->actual_length - < pUrb->transfer_buffer_length)) - pUrb->status = -EREMOTEIO ; + && (urb->status == -EINPROGRESS ) + && (urb->transfer_flags &URB_SHORT_NOT_OK ) + && (urb->actual_length + < urb->transfer_buffer_length)) + urb->status = -EREMOTEIO ; }musb_read_fifo (hw_ep, length, pBuffer);
@@ -624,7 +624,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)* Context: irqs blocked, controller lock held */ static void musb_ep_program (struct musb *musb,u8 epnum, -struct urb *pUrb,unsigned int is_out, +struct urb *urb,unsigned int is_out,u8 * pBuffer,u32 dwLength) {struct dma_controller *dma_controller;
@@ -646,7 +646,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,DBG (3 ,"%s hw%d urb %p spd%d dev%d ep%d%s " "h_addr%02x h_port%02x bytes %d\n" , is_out ?"-->" :"<--" , - epnum, pUrb, pUrb->dev->speed, + epnum, urb, urb->dev->speed, qh->addr_reg, qh->epnum, is_out ?"out" :"in" , qh->h_addr_reg, qh->h_port_reg, dwLength);
@@ -699,7 +699,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, ); csr |=MUSB_TXCSR_MODE ; -if (usb_gettoggle (pUrb->dev, +if (usb_gettoggle (urb->dev, qh->epnum,1 )) csr |=MUSB_TXCSR_H_WR_DATATOGGLE |MUSB_TXCSR_H_DATATOGGLE ;
@@ -794,7 +794,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, bDmaOk = dma_controller->channel_program ( pDmaChannel, packet_sz, pDmaChannel->desired_mode, - pUrb->transfer_dma, + urb->transfer_dma, qh->segsize);if (bDmaOk) { wLoadCount =0 ;
@@ -832,10 +832,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum,*/ bDmaOk = dma_controller->channel_program ( pDmaChannel, packet_sz, - (pUrb->transfer_flags + (urb->transfer_flags &URB_ZERO_PACKET ) ==URB_ZERO_PACKET , - pUrb->transfer_dma, + urb->transfer_dma, qh->segsize);if (bDmaOk) { wLoadCount =0 ;
@@ -878,7 +878,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,musb_rx_reinit (musb, qh, hw_ep);/* init new state: toggle and NYET, maybe DMA later */ -if (usb_gettoggle (pUrb->dev, qh->epnum,0 )) +if (usb_gettoggle (urb->dev, qh->epnum,0 )) csr =MUSB_RXCSR_H_WR_DATATOGGLE |MUSB_RXCSR_H_DATATOGGLE ;else
@@ -917,9 +917,9 @@ static void musb_ep_program(struct musb *musb, u8 epnum,*/ bDmaOk = dma_controller->channel_program ( pDmaChannel, packet_sz, - !(pUrb->transfer_flags + !(urb->transfer_flags &URB_SHORT_NOT_OK ), - pUrb->transfer_dma, + urb->transfer_dma, qh->segsize);if (!bDmaOk) { dma_controller->channel_release(
@@ -943,7 +943,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,* Return TRUE until it's time to start the status stage. */ static int musb_h_ep0_continue (struct musb *musb, -u16 len,struct urb *pUrb) +u16 len,struct urb *urb) {int bMore = FALSE;u8 *pFifoDest =NULL ;
@@ -954,25 +954,25 @@ static int musb_h_ep0_continue(struct musb *musb,switch (musb->ep0_stage) {case MGC_END0_IN : - pFifoDest = pUrb->transfer_buffer + pUrb->actual_length; - fifo_count =min (len, ((u16) (pUrb->transfer_buffer_length - - pUrb->actual_length))); + pFifoDest = urb->transfer_buffer + urb->actual_length; + fifo_count =min (len, ((u16) (urb->transfer_buffer_length + - urb->actual_length)));if (fifo_count < len) - pUrb->status = -EOVERFLOW ; + urb->status = -EOVERFLOW ;musb_read_fifo (hw_ep, fifo_count, pFifoDest); - pUrb->actual_length += fifo_count; + urb->actual_length += fifo_count;if (len < qh->maxpacket) {/* always terminate on short read; it's * rarely reported as an error. */ - }else if (pUrb->actual_length < - pUrb->transfer_buffer_length) + }else if (urb->actual_length < + urb->transfer_buffer_length) bMore = TRUE;break ;case MGC_END0_START : - request = (struct usb_ctrlrequest *) pUrb->setup_packet; + request = (struct usb_ctrlrequest *) urb->setup_packet;if (!request->wLength) {DBG (4 ,"start no-DATA\n" );
@@ -990,17 +990,17 @@ static int musb_h_ep0_continue(struct musb *musb,/* FALLTHROUGH */ case MGC_END0_OUT : fifo_count =min (qh->maxpacket, ((u16) - (pUrb->transfer_buffer_length - - pUrb->actual_length))); + (urb->transfer_buffer_length + - urb->actual_length)));if (fifo_count) { - pFifoDest = (u8 *) (pUrb->transfer_buffer - + pUrb->actual_length); + pFifoDest = (u8 *) (urb->transfer_buffer + + urb->actual_length);DBG (3 ,"Sending %d bytes to %p\n" , fifo_count, pFifoDest);musb_write_fifo (hw_ep, fifo_count, pFifoDest); - pUrb->actual_length += fifo_count; + urb->actual_length += fifo_count; bMore = TRUE; }break ;
@@ -1020,7 +1020,7 @@ static int musb_h_ep0_continue(struct musb *musb,*/ irqreturn_t musb_h_ep0_irq (struct musb *musb) { -struct urb *pUrb; +struct urb *urb;u16 csr, len;int status =0 ;void __iomem *mbase = musb->mregs;
@@ -1031,7 +1031,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)irqreturn_t retval =IRQ_NONE ;/* ep0 only has one queue, "in" */ - pUrb =next_urb (qh); + urb =next_urb (qh);musb_ep_select (mbase,0 ); csr =musb_readw (epio,MUSB_CSR0 );
@@ -1040,7 +1040,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) : 0;DBG (4 ,"<== csr0 %04x, qh %p, count %d, urb %p, stage %d\n" , - csr, qh, len, pUrb, musb->ep0_stage); + csr, qh, len, urb, musb->ep0_stage);/* if we just did status stage, we are done */ if (MGC_END0_STATUS == musb->ep0_stage) {
@@ -1074,8 +1074,8 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)if (status) {DBG (6 ,"aborting\n" ); retval =IRQ_HANDLED ; -if (pUrb) - pUrb->status = status; +if (urb) + urb->status = status; bComplete = TRUE;/* use the proper sequence to abort the transfer */
@@ -1098,7 +1098,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)musb_writew (epio,MUSB_CSR0 ,0 ); } -if (unlikely (!pUrb)) { +if (unlikely (!urb)) {/* stop endpoint since we have no place for its data, this * SHOULD NEVER HAPPEN! */ ERR ("no URB for end 0\n" );
@@ -1112,14 +1112,14 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)if (!bComplete) {/* call common logic and prepare response */ -if (musb_h_ep0_continue (musb, len, pUrb)) { +if (musb_h_ep0_continue (musb, len, urb)) {/* more packets required */ csr = (MGC_END0_IN == musb->ep0_stage) ?MUSB_CSR0_H_REQPKT :MUSB_CSR0_TXPKTRDY ; }else {/* data transfer complete; perform status phase */ -if (usb_pipeout (pUrb->pipe) - || !pUrb->transfer_buffer_length) +if (usb_pipeout (urb->pipe) + || !urb->transfer_buffer_length) csr =MUSB_CSR0_H_STATUSPKT |MUSB_CSR0_H_REQPKT ;else
@@ -1139,7 +1139,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)/* call completion handler if done */ if (bComplete) -musb_advance_schedule (musb, pUrb, hw_ep,1 ); +musb_advance_schedule (musb, urb, hw_ep,1 ); done:return retval; }
@@ -1169,7 +1169,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)u16 tx_csr;size_t wLength =0 ;u8 *pBuffer =NULL ; -struct urb *pUrb; +struct urb *urb;struct musb_hw_ep *hw_ep = musb->endpoints + epnum;void __iomem *epio = hw_ep->regs;struct musb_qh *qh = hw_ep->out_qh;
@@ -1177,18 +1177,18 @@ void musb_host_tx(struct musb *musb, u8 epnum)void __iomem *mbase = musb->mregs;struct dma_channel *dma; - pUrb =next_urb (qh); + urb =next_urb (qh);musb_ep_select (mbase, epnum); tx_csr =musb_readw (epio,MUSB_TXCSR );/* with CPPI, DMA sometimes triggers "extra" irqs */ -if (!pUrb) { +if (!urb) {DBG (4 ,"extra TX%d ready, csr %04x\n" , epnum, tx_csr); goto finish; } - nPipe = pUrb->pipe; + nPipe = urb->pipe; dma =is_dma_capable () ? hw_ep->tx_channel :NULL ;DBG (4 ,"OUT/TX%d end, csr %04x%s\n" , epnum, tx_csr, dma ?", dma" :"" );
@@ -1268,13 +1268,13 @@ void musb_host_tx(struct musb *musb, u8 epnum)if (usb_pipeisoc (nPipe)) {struct usb_iso_packet_descriptor *d; - d = pUrb->iso_frame_desc + qh->iso_idx; + d = urb->iso_frame_desc + qh->iso_idx; d->actual_length = qh->segsize; -if (++qh->iso_idx >= pUrb->number_of_packets) { +if (++qh->iso_idx >= urb->number_of_packets) { bDone = TRUE; }else if (!dma) { d++; - pBuffer = pUrb->transfer_buffer + d->offset; + pBuffer = urb->transfer_buffer + d->offset; wLength = d->length; } }else if (dma) {
@@ -1283,14 +1283,14 @@ void musb_host_tx(struct musb *musb, u8 epnum)/* see if we need to send more data, or ZLP */ if (qh->segsize < qh->maxpacket) bDone = TRUE; -else if (qh->offset == pUrb->transfer_buffer_length - && !(pUrb-> transfer_flags +else if (qh->offset == urb->transfer_buffer_length + && !(urb-> transfer_flags &URB_ZERO_PACKET )) bDone = TRUE;if (!bDone) { - pBuffer = pUrb->transfer_buffer + pBuffer = urb->transfer_buffer + qh->offset; - wLength = pUrb->transfer_buffer_length + wLength = urb->transfer_buffer_length - qh->offset; } }
@@ -1299,17 +1299,17 @@ void musb_host_tx(struct musb *musb, u8 epnum)/* urb->status != -EINPROGRESS means request has been faulted, * so we must abort this transfer after cleanup */ -if (pUrb->status != -EINPROGRESS ) { +if (urb->status != -EINPROGRESS ) { bDone = TRUE;if (status ==0 ) - status = pUrb->status; + status = urb->status; }if (bDone) {/* set status */ - pUrb->status = status; - pUrb->actual_length = qh->offset; -musb_advance_schedule (musb, pUrb, hw_ep,USB_DIR_OUT ); + urb->status = status; + urb->actual_length = qh->offset; +musb_advance_schedule (musb, urb, hw_ep,USB_DIR_OUT ); }else if (!(tx_csr &MUSB_TXCSR_DMAENAB )) {// WARN_ON(!pBuffer);
@@ -1379,7 +1379,7 @@ finish:*/ void musb_host_rx (struct musb *musb,u8 epnum) { -struct urb *pUrb; +struct urb *urb;struct musb_hw_ep *hw_ep = musb->endpoints + epnum;void __iomem *epio = hw_ep->regs;struct musb_qh *qh = hw_ep->in_qh;
@@ -1394,14 +1394,14 @@ void musb_host_rx(struct musb *musb, u8 epnum)musb_ep_select (mbase, epnum); - pUrb =next_urb (qh); + urb =next_urb (qh); dma =is_dma_capable () ? hw_ep->rx_channel :NULL ; status =0 ; xfer_len =0 ; wVal = rx_csr =musb_readw (epio,MUSB_RXCSR ); -if (unlikely (!pUrb)) { +if (unlikely (!urb)) {/* REVISIT -- THIS SHOULD NEVER HAPPEN ... but, at least * usbtest #11 (unlinks) triggers it regularly, sometimes * with fifo full. (Only with DMA??)
@@ -1412,10 +1412,10 @@ void musb_host_rx(struct musb *musb, u8 epnum)return ; } - nPipe = pUrb->pipe; + nPipe = urb->pipe;DBG (5 ,"<== hw %d rxcsr %04x, urb actual %d (+dma %zd)\n" , - epnum, rx_csr, pUrb->actual_length, + epnum, rx_csr, urb->actual_length, dma ? dma->actual_len :0 );/* check for errors, concurrent stall & unlink is not really
@@ -1516,9 +1516,9 @@ void musb_host_rx(struct musb *musb, u8 epnum)musb_writew (hw_ep->regs,MUSB_RXCSR , wVal);#ifdef CONFIG_USB_INVENTRA_DMA -/* bDone if pUrb buffer is full or short packet is recd */ - bDone = ((pUrb->actual_length + xfer_len) >= - pUrb->transfer_buffer_length) +/* bDone if urb buffer is full or short packet is recd */ + bDone = ((urb->actual_length + xfer_len) >= + urb->transfer_buffer_length) || (dma->actual_len & (qh->maxpacket -1 ));/* send IN token for next packet, without AUTOREQ */
@@ -1535,7 +1535,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)#else bDone = TRUE;#endif - }else if (pUrb->status == -EINPROGRESS ) { + }else if (urb->status == -EINPROGRESS ) {/* if no errors, be sure a packet is ready for unloading */ if (unlikely (!(rx_csr &MUSB_RXCSR_RXPKTRDY ))) { status = -EPROTO ;
@@ -1562,10 +1562,10 @@ void musb_host_rx(struct musb *musb, u8 epnum)DBG (2 ,"RX%d count %d, buffer 0x%x len %d/%d\n" , epnum, wRxCount, - pUrb->transfer_dma - + pUrb->actual_length, + urb->transfer_dma + + urb->actual_length, qh->offset, - pUrb->transfer_buffer_length); + urb->transfer_buffer_length); c = musb->dma_controller;
@@ -1574,10 +1574,10 @@ void musb_host_rx(struct musb *musb, u8 epnum)/* because of the issue below, mode 1 will * only rarely behave with correct semantics. */ -if ((pUrb->transfer_flags & +if ((urb->transfer_flags &URB_SHORT_NOT_OK ) - && (pUrb->transfer_buffer_length - - pUrb->actual_length) + && (urb->transfer_buffer_length - + urb->actual_length) > qh->maxpacket) dma->desired_mode =1 ;#endif
@@ -1618,11 +1618,11 @@ void musb_host_rx(struct musb *musb, u8 epnum) status = c->channel_program ( dma, qh->maxpacket, dma->desired_mode, - pUrb->transfer_dma - + pUrb->actual_length, + urb->transfer_dma + + urb->actual_length, (dma->desired_mode ==0 ) ? wRxCount - : pUrb->transfer_buffer_length); + : urb->transfer_buffer_length);if (!status) { c->channel_release (dma);
@@ -1633,19 +1633,19 @@ void musb_host_rx(struct musb *musb, u8 epnum)#endif /* Mentor DMA */ if (!dma) { - bDone =musb_host_packet_rx (musb, pUrb, + bDone =musb_host_packet_rx (musb, urb, epnum, bIsochError);DBG (6 ,"read %spacket\n" , bDone ?"last " :"" ); } } finish: - pUrb->actual_length += xfer_len; + urb->actual_length += xfer_len; qh->offset += xfer_len;if (bDone) { -if (pUrb->status == -EINPROGRESS ) - pUrb->status = status; -musb_advance_schedule (musb, pUrb, hw_ep,USB_DIR_IN ); +if (urb->status == -EINPROGRESS ) + urb->status = status; +musb_advance_schedule (musb, urb, hw_ep,USB_DIR_IN ); } }
@@ -1833,7 +1833,7 @@ static int musb_urb_enqueue(* transfer scheduling logic to try some other qh, e.g. try * for 2 msec first: * -* interval = (USB_SPEED_HIGH == pUrb->dev->speed) ? 16 : 2; +* interval = (USB_SPEED_HIGH == urb->dev->speed) ? 16 : 2; * * The downside of disabling this is that transfer scheduling * gets VERY unfair for nonperiodic transfers; a misbehaving
Signature · 1 line
1.5.2.3
PATCH 9/36 musb_hdrc: Search and replace pBuffer with buf
Search and replace pBuffer with buf
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)
drivers/usb/musb/musb_host.c +18 -18
@@ -105,7 +105,7 @@static void musb_ep_program (struct musb *musb,u8 epnum,struct urb *urb,unsigned int nOut, -u8 * pBuffer,u32 dwLength); +u8 * buf,u32 dwLength);/* * Clear TX fifo. Needed to avoid BABBLE errors.
@@ -171,7 +171,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) {u16 wFrame;u32 dwLength; -void *pBuffer; +void *buf;void __iomem *mbase = musb->mregs;struct urb *urb =next_urb (qh);struct musb_hw_ep *hw_ep = qh->hw_ep;
@@ -190,17 +190,17 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) is_in =0 ; hw_ep->out_qh = qh; musb->ep0_stage =MGC_END0_START ; - pBuffer = urb->setup_packet; + buf = urb->setup_packet; dwLength =8 ;break ;case USB_ENDPOINT_XFER_ISOC : qh->iso_idx =0 ; qh->frame =0 ; - pBuffer = urb->transfer_buffer + urb->iso_frame_desc[0 ].offset; + buf = urb->transfer_buffer + urb->iso_frame_desc[0 ].offset; dwLength = urb->iso_frame_desc[0 ].length;break ;default :/* bulk, interrupt */ - pBuffer = urb->transfer_buffer; + buf = urb->transfer_buffer; dwLength = urb->transfer_buffer_length; }
@@ -213,14 +213,14 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)case USB_ENDPOINT_XFER_ISOC : s ="-iso" ;break ;default : s ="-intr" ;break ; }; s;}), - epnum, pBuffer, dwLength); + epnum, buf, dwLength);/* Configure endpoint */ if (is_in || hw_ep->is_shared_fifo) hw_ep->in_qh = qh;else hw_ep->out_qh = qh; -musb_ep_program (musb, epnum, urb, !is_in, pBuffer, dwLength); +musb_ep_program (musb, epnum, urb, !is_in, buf, dwLength);/* transmit may have more work: start it when it is time */ if (is_in)
@@ -470,7 +470,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, u8 epnum, u8 bIsochError) {u16 wRxCount; -u8 *pBuffer; +u8 *buf;u16 csr;u8 bDone = FALSE;u32 length;
@@ -498,7 +498,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, } d = urb->iso_frame_desc + qh->iso_idx; - pBuffer = buffer + d->offset; + buf = buffer + d->offset; length = d->length;if (wRxCount > length) {if (status ==0 ) {
@@ -518,7 +518,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, bDone = (++qh->iso_idx >= urb->number_of_packets); }else {/* non-isoch */ - pBuffer = buffer + qh->offset; + buf = buffer + qh->offset; length = urb->transfer_buffer_length - qh->offset;if (wRxCount > length) {if (urb->status == -EINPROGRESS )
@@ -542,7 +542,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, urb->status = -EREMOTEIO ; } -musb_read_fifo (hw_ep, length, pBuffer); +musb_read_fifo (hw_ep, length, buf); csr =musb_readw (epio,MUSB_RXCSR ); csr |=MUSB_RXCSR_H_WZC_BITS ;
@@ -625,7 +625,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)*/ static void musb_ep_program (struct musb *musb,u8 epnum,struct urb *urb,unsigned int is_out, -u8 * pBuffer,u32 dwLength) +u8 * buf,u32 dwLength) {struct dma_controller *dma_controller;struct dma_channel *pDmaChannel;
@@ -855,7 +855,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* PIO to load FIFO */ qh->segsize = wLoadCount; -musb_write_fifo (hw_ep, wLoadCount, pBuffer); +musb_write_fifo (hw_ep, wLoadCount, buf); csr =musb_readw (epio,MUSB_TXCSR ); csr &= ~(MUSB_TXCSR_DMAENAB | MUSB_TXCSR_DMAMODE
@@ -1168,7 +1168,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)u8 bDone = FALSE;u16 tx_csr;size_t wLength =0 ; -u8 *pBuffer =NULL ; +u8 *buf =NULL ;struct urb *urb;struct musb_hw_ep *hw_ep = musb->endpoints + epnum;void __iomem *epio = hw_ep->regs;
@@ -1274,7 +1274,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) bDone = TRUE; }else if (!dma) { d++; - pBuffer = urb->transfer_buffer + d->offset; + buf = urb->transfer_buffer + d->offset; wLength = d->length; } }else if (dma) {
@@ -1288,7 +1288,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) & URB_ZERO_PACKET)) bDone = TRUE;if (!bDone) { - pBuffer = urb->transfer_buffer + buf = urb->transfer_buffer + qh->offset; wLength = urb->transfer_buffer_length - qh->offset;
@@ -1312,7 +1312,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)musb_advance_schedule (musb, urb, hw_ep,USB_DIR_OUT ); }else if (!(tx_csr &MUSB_TXCSR_DMAENAB )) { -// WARN_ON(!pBuffer); +// WARN_ON(!buf); /* REVISIT: some docs say that when hw_ep->tx_double_buffered, * (and presumably, fifo is not half-full) we should write TWO
@@ -1320,7 +1320,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)*/ /* PIO: start next packet in this URB */ wLength =min (qh->maxpacket, (u16 ) wLength); -musb_write_fifo (hw_ep, wLength, pBuffer); +musb_write_fifo (hw_ep, wLength, buf); qh->segsize = wLength;musb_ep_select (mbase, epnum);
Signature · 1 line
1.5.2.3
PATCH 10/36 musb_hdrc: Search and replace dwLength with len
Search and replace dwLength with len
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/cppi_dma.c | 6 +++--- drivers/usb/musb/musb_host.c | 28 ++++++++++++++-------------- drivers/usb/musb/musbhsdma.c | 20 ++++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-)
drivers/usb/musb/cppi_dma.c +3 -3
@@ -946,12 +946,12 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)* all short reads as errors and kick in high level fault recovery. * For TX, ignored because of RNDIS mode races/glitches. * @dma_addr: dma address of buffer -* @dwLength: length of buffer +* @len: length of buffer * Context: controller irqlocked */ static int cppi_channel_program (struct dma_channel *pChannel,u16 wPacketSz,u8 mode, -dma_addr_t dma_addr,u32 dwLength) +dma_addr_t dma_addr,u32 len) {struct cppi_channel *otgChannel = pChannel->private_data;struct cppi *pController = otgChannel->pController;
@@ -988,7 +988,7 @@ static int cppi_channel_program(struct dma_channel *pChannel, otgChannel->currOffset =0 ; otgChannel->pktSize = wPacketSz; otgChannel->actualLen =0 ; - otgChannel->transferSize = dwLength; + otgChannel->transferSize = len;/* TX channel? or RX? */ if (otgChannel->transmit)
drivers/usb/musb/musb_host.c +14 -14
@@ -105,7 +105,7 @@static void musb_ep_program (struct musb *musb,u8 epnum,struct urb *urb,unsigned int nOut, -u8 * buf,u32 dwLength); +u8 * buf,u32 len);/* * Clear TX fifo. Needed to avoid BABBLE errors.
@@ -170,7 +170,7 @@ static void musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) { u16 wFrame; -u32 dwLength; +u32 len;void *buf;void __iomem *mbase = musb->mregs;struct urb *urb =next_urb (qh);
@@ -191,17 +191,17 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) hw_ep->out_qh = qh; musb->ep0_stage =MGC_END0_START ; buf = urb->setup_packet; - dwLength =8 ; + len =8 ;break ;case USB_ENDPOINT_XFER_ISOC : qh->iso_idx =0 ; qh->frame =0 ; buf = urb->transfer_buffer + urb->iso_frame_desc[0 ].offset; - dwLength = urb->iso_frame_desc[0 ].length; + len = urb->iso_frame_desc[0 ].length;break ;default :/* bulk, interrupt */ buf = urb->transfer_buffer; - dwLength = urb->transfer_buffer_length; + len = urb->transfer_buffer_length; } DBG(4, "qh %p urb %p dev%d ep%d%s%s, hw_ep %d, %p/%d\n",
@@ -213,14 +213,14 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)case USB_ENDPOINT_XFER_ISOC : s ="-iso" ;break ;default : s ="-intr" ;break ; }; s;}), - epnum, buf, dwLength); + epnum, buf, len);/* Configure endpoint */ if (is_in || hw_ep->is_shared_fifo) hw_ep->in_qh = qh;else hw_ep->out_qh = qh; -musb_ep_program (musb, epnum, urb, !is_in, buf, dwLength); +musb_ep_program (musb, epnum, urb, !is_in, buf, len);/* transmit may have more work: start it when it is time */ if (is_in)
@@ -625,7 +625,7 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, struct musb_hw_ep *ep)*/ static void musb_ep_program (struct musb *musb,u8 epnum,struct urb *urb,unsigned int is_out, -u8 * buf,u32 dwLength) +u8 * buf,u32 len) {struct dma_controller *dma_controller;struct dma_channel *pDmaChannel;
@@ -649,7 +649,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, epnum, urb, urb->dev->speed, qh->addr_reg, qh->epnum, is_out ?"out" :"in" , qh->h_addr_reg, qh->h_port_reg, - dwLength); + len);musb_ep_select (mbase, epnum);
@@ -755,9 +755,9 @@ 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, - dwLength); + len);else - wLoadCount =min ((u32 ) packet_sz, dwLength); + wLoadCount =min ((u32 ) packet_sz, len);#ifdef CONFIG_USB_INVENTRA_DMA if (pDmaChannel) {
@@ -771,7 +771,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,musb_writew (epio,MUSB_TXCSR , csr |MUSB_TXCSR_MODE ); - qh->segsize =min (dwLength, pDmaChannel->max_len); + qh->segsize =min (len, pDmaChannel->max_len);if (qh->segsize <= packet_sz) pDmaChannel->desired_mode =0 ;
@@ -825,7 +825,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, csr | MUSB_TXCSR_MODE); pDmaChannel->actual_len =0L ; - qh->segsize = dwLength; + qh->segsize = len;/* TX uses "rndis" mode automatically, but needs help * to identify the zero-length-final-packet case.
@@ -905,7 +905,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* candidate for DMA */ if (pDmaChannel) { pDmaChannel->actual_len =0L ; - qh->segsize = dwLength; + qh->segsize = len;/* AUTOREQ is in a DMA register */ musb_writew (hw_ep->regs,MUSB_RXCSR , csr);
drivers/usb/musb/musbhsdma.c +10 -10
@@ -172,7 +172,7 @@ static void dma_channel_release(struct dma_channel *pChannel)static void configure_channel (struct dma_channel *pChannel,u16 packet_sz,u8 mode, -dma_addr_t dma_addr,u32 dwLength) +dma_addr_t dma_addr,u32 len) {struct musb_dma_channel *pImplChannel = (struct musb_dma_channel *) pChannel->private_data;
@@ -182,11 +182,11 @@ static void configure_channel(struct dma_channel *pChannel,u16 csr =0 ;DBG (4 ,"%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n" , - pChannel, packet_sz, dma_addr, dwLength, mode); + pChannel, packet_sz, dma_addr, len, mode);if (mode) { csr |=1 <<MUSB_HSDMA_MODE1_SHIFT ; -if (dwLength < packet_sz) { +if (len < packet_sz) {return FALSE; }if (packet_sz >=64 ) {
@@ -212,7 +212,7 @@ static void configure_channel(struct dma_channel *pChannel, dma_addr);musb_writel (mbase,MGC_HSDMA_CHANNEL_OFFSET (bChannel,MGC_O_HSDMA_COUNT ), - dwLength); + len);/* control (this should start things) */ musb_writew(mbase,
@@ -222,7 +222,7 @@ static void configure_channel(struct dma_channel *pChannel,static int dma_channel_program (struct dma_channel * pChannel,u16 packet_sz,u8 mode, -dma_addr_t dma_addr,u32 dwLength) +dma_addr_t dma_addr,u32 len) {struct musb_dma_channel *pImplChannel = (struct musb_dma_channel *) pChannel->private_data;
@@ -230,23 +230,23 @@ static int dma_channel_program(struct dma_channel * pChannel,DBG (2 ,"ep%d-%s pkt_sz %d, dma_addr 0x%x length %d, mode %d\n" , pImplChannel->epnum, pImplChannel->transmit ?"Tx" :"Rx" , - packet_sz, dma_addr, dwLength, mode); + packet_sz, dma_addr, len, mode);BUG_ON (pChannel->status ==MGC_DMA_STATUS_UNKNOWN || pChannel->status ==MGC_DMA_STATUS_BUSY ); pChannel->actual_len =0 ; pImplChannel->dwStartAddress = dma_addr; - pImplChannel->len = dwLength; + pImplChannel->len = len; pImplChannel->wMaxPacketSize = packet_sz; pChannel->status =MGC_DMA_STATUS_BUSY ; -if ((mode ==1 ) && (dwLength >= packet_sz)) { +if ((mode ==1 ) && (len >= packet_sz)) {configure_channel (pChannel, packet_sz,1 , dma_addr, - dwLength); + len); }else configure_channel (pChannel, packet_sz,0 , dma_addr, - dwLength); + len);return TRUE; }
Signature · 1 line
1.5.2.3
PATCH 11/36 musb_hdrc: Search and replace wEndMask with epmask
Search and replace wEndMask with epmask
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/davinci.c | 4 ++-- drivers/usb/musb/musbdefs.h | 2 +- drivers/usb/musb/plat_uds.c | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/usb/musb/davinci.c +2 -2
@@ -77,11 +77,11 @@ void musb_platform_enable(struct musb *musb)u32 tmp, old, val;/* workaround: setup irqs through both register sets */ - tmp = (musb->wEndMask &DAVINCI_USB_TX_ENDPTS_MASK ) + tmp = (musb->epmask &DAVINCI_USB_TX_ENDPTS_MASK ) <<DAVINCI_USB_TXINT_SHIFT ;musb_writel (musb->ctrl_base,DAVINCI_USB_INT_MASK_SET_REG , tmp); old = tmp; - tmp = (musb->wEndMask & (0xfffe &DAVINCI_USB_RX_ENDPTS_MASK )) + tmp = (musb->epmask & (0xfffe &DAVINCI_USB_RX_ENDPTS_MASK )) <<DAVINCI_USB_RXINT_SHIFT ;musb_writel (musb->ctrl_base,DAVINCI_USB_INT_MASK_SET_REG , tmp); tmp |= old;
drivers/usb/musb/musbdefs.h +1 -1
@@ -383,7 +383,7 @@ struct musb {#define VBUSERR_RETRY_COUNT 3u16 vbuserr_retry; -u16 wEndMask; +u16 epmask;u8 nr_endpoints;u8 board_mode;/* enum musb_mode */
drivers/usb/musb/plat_uds.c +8 -8
@@ -558,8 +558,8 @@ static irqreturn_t musb_stage0_irq(struct musb * musb, u8 int_usb,// REVISIT HNP; just force disconnect } musb->delay_port_power_off = FALSE; -musb_writew (mbase,MUSB_INTRTXE , musb->wEndMask); -musb_writew (mbase,MUSB_INTRRXE , musb->wEndMask &0xfffe ); +musb_writew (mbase,MUSB_INTRTXE , musb->epmask); +musb_writew (mbase,MUSB_INTRRXE , musb->epmask &0xfffe );musb_writeb (mbase,MUSB_INTRUSBE ,0xf7 );#endif musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED
@@ -672,7 +672,7 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 int_usb, wFrame =musb_readw (mbase,MUSB_FRAME ); ep = musb->endpoints;for (epnum =1 ; (epnum < musb->nr_endpoints) - && (musb->wEndMask >= (1 << epnum)); + && (musb->epmask >= (1 << epnum)); epnum++, ep++) {// FIXME handle framecounter wraps (12 bits) // eliminate duplicated StartUrb logic
@@ -792,8 +792,8 @@ void musb_start(struct musb *musb)DBG (2 ,"<== devctl %02x\n" , devctl);/* Set INT enable registers, enable interrupts */ -musb_writew (regs,MUSB_INTRTXE , musb->wEndMask); -musb_writew (regs,MUSB_INTRRXE , musb->wEndMask &0xfffe ); +musb_writew (regs,MUSB_INTRTXE , musb->epmask); +musb_writew (regs,MUSB_INTRRXE , musb->epmask &0xfffe );musb_writeb (regs,MUSB_INTRUSBE ,0xf7 );musb_writeb (regs,MUSB_TESTMODE ,0 );
@@ -1086,7 +1086,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->epnum); + musb->epmask |= (1 << hw_ep->epnum);return offset + (maxpacket << ((c_size &MUSB_FIFOSZ_DPB ) ?1 :0 )); }
@@ -1198,7 +1198,7 @@ static int __init ep_config_from_hw(struct musb *musb)break ; } musb->nr_endpoints++; - musb->wEndMask |= (1 << epnum); + musb->epmask |= (1 << epnum); hw_ep->max_packet_sz_tx =1 << (reg &0x0f );
@@ -1340,7 +1340,7 @@ static int __init musb_core_init(u16 wType, struct musb *musb)/* discover endpoint configuration */ musb->nr_endpoints =1 ; - musb->wEndMask =1 ; + musb->epmask =1 ;if (reg &MUSB_CONFIGDATA_DYNFIFO ) {if (can_dynfifo ())
Signature · 1 line
1.5.2.3
PATCH 12/36 musb_hdrc: Search and replace pDmaChannel with dma_channel
Search and replace pDmaChannel with dma_channel
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-)
drivers/usb/musb/musb_host.c +27 -27
@@ -628,7 +628,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, u8 * buf, u32 len) {struct dma_controller *dma_controller; -struct dma_channel *pDmaChannel; +struct dma_channel *dma_channel;u8 bDmaOk;void __iomem *mbase = musb->mregs;struct musb_hw_ep *hw_ep = musb->endpoints + epnum;
@@ -656,17 +656,17 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* candidate for DMA? */ dma_controller = musb->dma_controller;if (is_dma_capable () && epnum && dma_controller) { - pDmaChannel = is_out ? hw_ep->tx_channel : hw_ep->rx_channel; -if (!pDmaChannel) { - pDmaChannel = dma_controller->channel_alloc ( + dma_channel = is_out ? hw_ep->tx_channel : hw_ep->rx_channel; +if (!dma_channel) { + dma_channel = dma_controller->channel_alloc ( dma_controller, hw_ep, is_out);if (is_out) - hw_ep->tx_channel = pDmaChannel; + hw_ep->tx_channel = dma_channel;else - hw_ep->rx_channel = pDmaChannel; + hw_ep->rx_channel = dma_channel; } }else - pDmaChannel =NULL ; + dma_channel =NULL ;/* make sure we clear DMAEnab, autoSet bits from previous run */
@@ -760,7 +760,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, wLoadCount =min ((u32 ) packet_sz, len);#ifdef CONFIG_USB_INVENTRA_DMA -if (pDmaChannel) { +if (dma_channel) {/* clear previous state */ csr =musb_readw (epio,MUSB_TXCSR );
@@ -771,15 +771,15 @@ static void musb_ep_program(struct musb *musb, u8 epnum,musb_writew (epio,MUSB_TXCSR , csr |MUSB_TXCSR_MODE ); - qh->segsize =min (len, pDmaChannel->max_len); + qh->segsize =min (len, dma_channel->max_len);if (qh->segsize <= packet_sz) - pDmaChannel->desired_mode =0 ; + dma_channel->desired_mode =0 ;else - pDmaChannel->desired_mode =1 ; + dma_channel->desired_mode =1 ; -if (pDmaChannel->desired_mode ==0 ) { +if (dma_channel->desired_mode ==0 ) { csr &= ~(MUSB_TXCSR_AUTOSET |MUSB_TXCSR_DMAMODE ); csr |= (MUSB_TXCSR_DMAENAB );
@@ -792,25 +792,25 @@ static void musb_ep_program(struct musb *musb, u8 epnum,musb_writew (epio,MUSB_TXCSR , csr); bDmaOk = dma_controller->channel_program ( - pDmaChannel, packet_sz, - pDmaChannel->desired_mode, + dma_channel, packet_sz, + dma_channel->desired_mode, urb->transfer_dma, qh->segsize);if (bDmaOk) { wLoadCount =0 ; }else { - dma_controller->channel_release (pDmaChannel); + dma_controller->channel_release (dma_channel);if (is_out) hw_ep->tx_channel =NULL ;else hw_ep->rx_channel =NULL ; - pDmaChannel =NULL ; + dma_channel =NULL ; } }#endif /* candidate for DMA */ -if ((is_cppi_enabled () ||tusb_dma_omap ()) && pDmaChannel) { +if ((is_cppi_enabled () ||tusb_dma_omap ()) && dma_channel) {/* program endpoint CSRs first, then setup DMA. * assume CPPI setup succeeds.
@@ -824,14 +824,14 @@ static void musb_ep_program(struct musb *musb, u8 epnum,musb_writew (epio,MUSB_TXCSR , csr |MUSB_TXCSR_MODE ); - pDmaChannel->actual_len =0L ; + dma_channel->actual_len =0L ; qh->segsize = len;/* TX uses "rndis" mode automatically, but needs help * to identify the zero-length-final-packet case. */ bDmaOk = dma_controller->channel_program( - pDmaChannel, packet_sz, + dma_channel, packet_sz, (urb->transfer_flags & URB_ZERO_PACKET) == URB_ZERO_PACKET,
@@ -840,8 +840,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum,if (bDmaOk) { wLoadCount =0 ; }else { - dma_controller->channel_release (pDmaChannel); - pDmaChannel = hw_ep->tx_channel =NULL ; + dma_controller->channel_release (dma_channel); + dma_channel = hw_ep->tx_channel =NULL ;/* REVISIT there's an error path here that * needs handling: can't do dma, but
@@ -901,10 +901,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* kick things off */ -if ((is_cppi_enabled () ||tusb_dma_omap ()) && pDmaChannel) { +if ((is_cppi_enabled () ||tusb_dma_omap ()) && dma_channel) {/* candidate for DMA */ -if (pDmaChannel) { - pDmaChannel->actual_len =0L ; +if (dma_channel) { + dma_channel->actual_len =0L ; qh->segsize = len;/* AUTOREQ is in a DMA register */
@@ -916,15 +916,15 @@ static void musb_ep_program(struct musb *musb, u8 epnum,* errors, we dare not queue multiple transfers. */ bDmaOk = dma_controller->channel_program ( - pDmaChannel, packet_sz, + dma_channel, packet_sz, !(urb->transfer_flags &URB_SHORT_NOT_OK ), urb->transfer_dma, qh->segsize);if (!bDmaOk) { dma_controller->channel_release ( - pDmaChannel); - pDmaChannel = hw_ep->rx_channel =NULL ; + dma_channel); + dma_channel = hw_ep->rx_channel =NULL ; }else csr |=MUSB_RXCSR_DMAENAB ; }
Signature · 1 line
1.5.2.3
PATCH 13/36 musb_hdrc: Search and replace wRxCount with rx_count
Search and replace wRxCount with rx_count
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/usb/musb/musb_host.c +14 -14
@@ -469,7 +469,7 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)static u8 musb_host_packet_rx (struct musb *musb,struct urb *urb,u8 epnum,u8 bIsochError) { -u16 wRxCount; +u16 rx_count;u8 *buf;u16 csr;u8 bDone = FALSE;
@@ -482,8 +482,8 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,void *buffer = urb->transfer_buffer;// musb_ep_select(mbase, epnum); - wRxCount =musb_readw (epio,MUSB_RXCOUNT ); -DBG (3 ,"RX%d count %d, buffer %p len %d/%d\n" , epnum, wRxCount, + rx_count =musb_readw (epio,MUSB_RXCOUNT ); +DBG (3 ,"RX%d count %d, buffer %p len %d/%d\n" , epnum, rx_count, urb->transfer_buffer, qh->offset, urb->transfer_buffer_length);
@@ -500,15 +500,15 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, d = urb->iso_frame_desc + qh->iso_idx; buf = buffer + d->offset; length = d->length; -if (wRxCount > length) { +if (rx_count > length) {if (status ==0 ) { status = -EOVERFLOW ; urb->error_count++; } -DBG (2 ,"** OVERFLOW %d into %d\n" , wRxCount, length); +DBG (2 ,"** OVERFLOW %d into %d\n" , rx_count, length); do_flush =1 ; }else - length = wRxCount; + length = rx_count; urb->actual_length += length; d->actual_length = length;
@@ -520,19 +520,19 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,/* non-isoch */ buf = buffer + qh->offset; length = urb->transfer_buffer_length - qh->offset; -if (wRxCount > length) { +if (rx_count > length) {if (urb->status == -EINPROGRESS ) urb->status = -EOVERFLOW ; -DBG (2 ,"** OVERFLOW %d into %d\n" , wRxCount, length); +DBG (2 ,"** OVERFLOW %d into %d\n" , rx_count, length); do_flush =1 ; }else - length = wRxCount; + length = rx_count; urb->actual_length += length; qh->offset += length;/* see if we are done */ bDone = (urb->actual_length == urb->transfer_buffer_length) - || (wRxCount < qh->maxpacket) + || (rx_count < qh->maxpacket) || (urb->status != -EINPROGRESS );if (bDone && (urb->status == -EINPROGRESS)
@@ -1555,13 +1555,13 @@ void musb_host_rx(struct musb *musb, u8 epnum)#ifdef CONFIG_USB_INVENTRA_DMA if (dma) {struct dma_controller *c; -u16 wRxCount; +u16 rx_count;int status; - wRxCount =musb_readw (epio,MUSB_RXCOUNT ); + rx_count =musb_readw (epio,MUSB_RXCOUNT ); DBG(2, "RX%d count %d, buffer 0x%x len %d/%d\n", - epnum, wRxCount, + epnum, rx_count, urb->transfer_dma + urb->actual_length, qh->offset,
@@ -1621,7 +1621,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) urb->transfer_dma + urb->actual_length, (dma->desired_mode ==0 ) - ? wRxCount + ? rx_count : urb->transfer_buffer_length);if (!status) {
Signature · 1 line
1.5.2.3
PATCH 14/36 musb_hdrc: Search and replace bDone with done
Search and replace bDone with done
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 52 +++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 26 deletions(-)
drivers/usb/musb/musb_host.c +26 -26
@@ -472,7 +472,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,u16 rx_count;u8 *buf;u16 csr; -u8 bDone = FALSE; +u8 done = FALSE;u32 length;int do_flush =0 ;struct musb_hw_ep *hw_ep = musb->endpoints + epnum;
@@ -515,7 +515,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, d->status = status;/* see if we are done */ - bDone = (++qh->iso_idx >= urb->number_of_packets); + done = (++qh->iso_idx >= urb->number_of_packets); }else {/* non-isoch */ buf = buffer + qh->offset;
@@ -531,10 +531,10 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, qh->offset += length;/* see if we are done */ - bDone = (urb->actual_length == urb->transfer_buffer_length) + done = (urb->actual_length == urb->transfer_buffer_length) || (rx_count < qh->maxpacket) || (urb->status != -EINPROGRESS ); - if (bDone + if (done && (urb->status == -EINPROGRESS) && (urb->transfer_flags & URB_SHORT_NOT_OK) && (urb->actual_length
@@ -551,12 +551,12 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,else {/* REVISIT this assumes AUTOCLEAR is never set */ csr &= ~(MUSB_RXCSR_RXPKTRDY |MUSB_RXCSR_H_REQPKT ); -if (!bDone) +if (!done) csr |=MUSB_RXCSR_H_REQPKT ;musb_writew (epio,MUSB_RXCSR , csr); } -return bDone; +return done; }/* we don't always need to reinit a given side of an endpoint...
@@ -1165,7 +1165,7 @@ done:void musb_host_tx (struct musb *musb,u8 epnum) {int nPipe; -u8 bDone = FALSE; +u8 done = FALSE;u16 tx_csr;size_t wLength =0 ;u8 *buf =NULL ;
@@ -1247,7 +1247,7 @@ void musb_host_tx(struct musb *musb, u8 epnum)musb_writew (epio,MUSB_TXCSR , tx_csr);musb_writeb (epio,MUSB_TXINTERVAL ,0 ); - bDone = TRUE; + done = TRUE; }/* second cppi case */
@@ -1271,23 +1271,23 @@ void musb_host_tx(struct musb *musb, u8 epnum) d = urb->iso_frame_desc + qh->iso_idx; d->actual_length = qh->segsize;if (++qh->iso_idx >= urb->number_of_packets) { - bDone = TRUE; + done = TRUE; }else if (!dma) { d++; buf = urb->transfer_buffer + d->offset; wLength = d->length; } }else if (dma) { - bDone = TRUE; + done = TRUE; }else {/* see if we need to send more data, or ZLP */ if (qh->segsize < qh->maxpacket) - bDone = TRUE; + done = TRUE;else if (qh->offset == urb->transfer_buffer_length && !(urb-> transfer_flags &URB_ZERO_PACKET )) - bDone = TRUE; -if (!bDone) { + done = TRUE; +if (!done) { buf = urb->transfer_buffer + qh->offset; wLength = urb->transfer_buffer_length
@@ -1300,12 +1300,12 @@ void musb_host_tx(struct musb *musb, u8 epnum)* so we must abort this transfer after cleanup */ if (urb->status != -EINPROGRESS ) { - bDone = TRUE; + done = TRUE;if (status ==0 ) status = urb->status; } -if (bDone) { +if (done) {/* set status */ urb->status = status; urb->actual_length = qh->offset;
@@ -1388,7 +1388,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)int nPipe;u16 rx_csr, wVal;u8 bIsochError = FALSE; -u8 bDone = FALSE; +u8 done = FALSE;u32 status;struct dma_channel *dma;
@@ -1466,7 +1466,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) }musb_h_flush_rxfifo (hw_ep,0 );musb_writeb (epio,MUSB_RXINTERVAL ,0 ); - bDone = TRUE; + done = TRUE; goto finish; }
@@ -1494,7 +1494,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) dma->status =MGC_DMA_STATUS_CORE_ABORT ; (void ) musb->dma_controller->channel_abort (dma); xfer_len = dma->actual_len; - bDone = TRUE; + done = TRUE; } DBG(2, "RXCSR%d %04x, reqpkt, len %zd%s\n", epnum, rx_csr,
@@ -1516,24 +1516,24 @@ void musb_host_rx(struct musb *musb, u8 epnum)musb_writew (hw_ep->regs,MUSB_RXCSR , wVal);#ifdef CONFIG_USB_INVENTRA_DMA -/* bDone if urb buffer is full or short packet is recd */ - bDone = ((urb->actual_length + xfer_len) >= +/* done if urb buffer is full or short packet is recd */ + done = ((urb->actual_length + xfer_len) >= urb->transfer_buffer_length) || (dma->actual_len & (qh->maxpacket -1 ));/* send IN token for next packet, without AUTOREQ */ -if (!bDone) { +if (!done) { wVal |=MUSB_RXCSR_H_REQPKT ;musb_writew (epio,MUSB_RXCSR ,MUSB_RXCSR_H_WZC_BITS | wVal); }DBG (4 ,"ep %d dma %s, rxcsr %04x, rxcount %d\n" , epnum, - bDone ?"off" :"reset" , + done ?"off" :"reset" ,musb_readw (epio,MUSB_RXCSR ),musb_readw (epio,MUSB_RXCOUNT ));#else - bDone = TRUE; + done = TRUE;#endif }else if (urb->status == -EINPROGRESS ) {/* if no errors, be sure a packet is ready for unloading */
@@ -1633,16 +1633,16 @@ void musb_host_rx(struct musb *musb, u8 epnum)#endif /* Mentor DMA */ if (!dma) { - bDone =musb_host_packet_rx (musb, urb, + done =musb_host_packet_rx (musb, urb, epnum, bIsochError); -DBG (6 ,"read %spacket\n" , bDone ?"last " :"" ); +DBG (6 ,"read %spacket\n" , done ?"last " :"" ); } } finish: urb->actual_length += xfer_len; qh->offset += xfer_len; -if (bDone) { +if (done) {if (urb->status == -EINPROGRESS ) urb->status = status;musb_advance_schedule (musb, urb, hw_ep,USB_DIR_IN );
Signature · 1 line
1.5.2.3
PATCH 15/36 musb_hdrc: Search and replace nPipe with pipe
Search and replace nPipe with pipe
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/usb/musb/musb_host.c +10 -10
@@ -175,8 +175,8 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)void __iomem *mbase = musb->mregs;struct urb *urb =next_urb (qh);struct musb_hw_ep *hw_ep = qh->hw_ep; -unsigned nPipe = urb->pipe; -u8 address =usb_pipedevice (nPipe); +unsigned pipe = urb->pipe; +u8 address =usb_pipedevice (pipe);int epnum = hw_ep->epnum;/* initialize software qh state */
@@ -478,7 +478,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,struct musb_hw_ep *hw_ep = musb->endpoints + epnum;void __iomem *epio = hw_ep->regs;struct musb_qh *qh = hw_ep->in_qh; -int nPipe = urb->pipe; +int pipe = urb->pipe;void *buffer = urb->transfer_buffer;// musb_ep_select(mbase, epnum);
@@ -488,7 +488,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb, urb->transfer_buffer_length);/* unload FIFO */ -if (usb_pipeisoc (nPipe)) { +if (usb_pipeisoc (pipe)) {int status =0 ;struct usb_iso_packet_descriptor *d;
@@ -1164,7 +1164,7 @@ done:/* Service a Tx-Available or dma completion irq for the endpoint */ void musb_host_tx (struct musb *musb,u8 epnum) { -int nPipe; +int pipe;u8 done = FALSE;u16 tx_csr;size_t wLength =0 ;
@@ -1188,7 +1188,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) goto finish; } - nPipe = urb->pipe; + pipe = urb->pipe; dma =is_dma_capable () ? hw_ep->tx_channel :NULL ;DBG (4 ,"OUT/TX%d end, csr %04x%s\n" , epnum, tx_csr, dma ?", dma" :"" );
@@ -1258,14 +1258,14 @@ void musb_host_tx(struct musb *musb, u8 epnum) }/* REVISIT this looks wrong... */ -if (!status || dma ||usb_pipeisoc (nPipe)) { +if (!status || dma ||usb_pipeisoc (pipe)) {if (dma) wLength = dma->actual_len;else wLength = qh->segsize; qh->offset += wLength; -if (usb_pipeisoc (nPipe)) { +if (usb_pipeisoc (pipe)) {struct usb_iso_packet_descriptor *d; d = urb->iso_frame_desc + qh->iso_idx;
@@ -1385,7 +1385,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)struct musb_qh *qh = hw_ep->in_qh;size_t xfer_len;void __iomem *mbase = musb->mregs; -int nPipe; +int pipe;u16 rx_csr, wVal;u8 bIsochError = FALSE;u8 done = FALSE;
@@ -1412,7 +1412,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)return ; } - nPipe = urb->pipe; + pipe = urb->pipe; DBG(5, "<== hw %d rxcsr %04x, urb actual %d (+dma %zd)\n", epnum, rx_csr, urb->actual_length,
Signature · 1 line
1.5.2.3
PATCH 16/36 musb_hdrc: Search and replace wLoadCount with load_count
Search and replace wLoadCount with load_count
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/musb/musb_host.c +8 -8
@@ -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
Signature · 1 line
1.5.2.3
PATCH 17/36 musb_hdrc: Search and replace bDmaOk with dma_ok
Search and replace bDmaOk with dma_ok
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/usb/musb/musb_host.c +7 -7
@@ -629,7 +629,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, {struct dma_controller *dma_controller;struct dma_channel *dma_channel; -u8 bDmaOk; +u8 dma_ok;void __iomem *mbase = musb->mregs;struct musb_hw_ep *hw_ep = musb->endpoints + epnum;void __iomem *epio = hw_ep->regs;
@@ -791,12 +791,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,musb_writew (epio,MUSB_TXCSR , csr); - bDmaOk = dma_controller->channel_program ( + dma_ok = dma_controller->channel_program ( dma_channel, packet_sz, dma_channel->desired_mode, urb->transfer_dma, qh->segsize); -if (bDmaOk) { +if (dma_ok) { load_count =0 ; }else { dma_controller->channel_release (dma_channel);
@@ -830,14 +830,14 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* TX uses "rndis" mode automatically, but needs help * to identify the zero-length-final-packet case. */ - bDmaOk = dma_controller->channel_program ( + dma_ok = dma_controller->channel_program ( dma_channel, packet_sz, (urb->transfer_flags &URB_ZERO_PACKET ) ==URB_ZERO_PACKET , urb->transfer_dma, qh->segsize); -if (bDmaOk) { +if (dma_ok) { load_count =0 ; }else { dma_controller->channel_release (dma_channel);
@@ -915,13 +915,13 @@ static void musb_ep_program(struct musb *musb, u8 epnum,/* unless caller treats short rx transfers as * errors, we dare not queue multiple transfers. */ - bDmaOk = dma_controller->channel_program ( + dma_ok = dma_controller->channel_program ( dma_channel, packet_sz, !(urb->transfer_flags &URB_SHORT_NOT_OK ), urb->transfer_dma, qh->segsize); -if (!bDmaOk) { +if (!dma_ok) { dma_controller->channel_release ( dma_channel); dma_channel = hw_ep->rx_channel =NULL ;
Signature · 1 line
1.5.2.3
PATCH 18/36 musb_hdrc: Search and replace pFifoDest with fifo_dest
Search and replace pFifoDest with fifo_dest
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/usb/musb/musb_host.c +6 -6
@@ -946,7 +946,7 @@ static int musb_h_ep0_continue(struct musb *musb, u16 len, struct urb *urb) { int bMore = FALSE; -u8 *pFifoDest =NULL ; +u8 *fifo_dest =NULL ;u16 fifo_count =0 ;struct musb_hw_ep *hw_ep = musb->control_ep;struct musb_qh *qh = hw_ep->in_qh;
@@ -954,13 +954,13 @@ static int musb_h_ep0_continue(struct musb *musb,switch (musb->ep0_stage) {case MGC_END0_IN : - pFifoDest = urb->transfer_buffer + urb->actual_length; + fifo_dest = urb->transfer_buffer + urb->actual_length; fifo_count =min (len, ((u16) (urb->transfer_buffer_length - urb->actual_length)));if (fifo_count < len) urb->status = -EOVERFLOW ; -musb_read_fifo (hw_ep, fifo_count, pFifoDest); +musb_read_fifo (hw_ep, fifo_count, fifo_dest); urb->actual_length += fifo_count;if (len < qh->maxpacket) {
@@ -994,11 +994,11 @@ static int musb_h_ep0_continue(struct musb *musb, - urb->actual_length)));if (fifo_count) { - pFifoDest = (u8 *) (urb->transfer_buffer + fifo_dest = (u8 *) (urb->transfer_buffer + urb->actual_length);DBG (3 ,"Sending %d bytes to %p\n" , - fifo_count, pFifoDest); -musb_write_fifo (hw_ep, fifo_count, pFifoDest); + fifo_count, fifo_dest); +musb_write_fifo (hw_ep, fifo_count, fifo_dest); urb->actual_length += fifo_count; bMore = TRUE;
Signature · 1 line
1.5.2.3
PATCH 19/36 musb_hdrc: Search and replace pFifoSource with fifo_src
Search and replace pFifoSource with fifo_src
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/g_ep0.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/usb/musb/g_ep0.c +3 -3
@@ -487,7 +487,7 @@ static void ep0_txstate(struct musb *musb)void __iomem *regs = musb->control_ep->regs;struct usb_request *request =next_ep0_request (musb);u16 csr =MUSB_CSR0_TXPKTRDY ; -u8 *pFifoSource; +u8 *fifo_src;u8 fifo_count;if (!request) {
@@ -497,10 +497,10 @@ static void ep0_txstate(struct musb *musb) }/* load the data */ - pFifoSource = (u8 *) request->buf + request->actual; + fifo_src = (u8 *) request->buf + request->actual; fifo_count =min ((unsigned )MUSB_EP0_FIFOSIZE , request->length - request->actual); -musb_write_fifo (&musb->endpoints[0 ], fifo_count, pFifoSource); +musb_write_fifo (&musb->endpoints[0 ], fifo_count, fifo_src); request->actual += fifo_count;/* update the flags */
Signature · 1 line
1.5.2.3
PATCH 20/36 musb_hdrc: Search and replace bIsochError with iso_err
Search and replace bIsochError with iso_err
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/usb/musb/musb_host.c +5 -5
@@ -467,7 +467,7 @@ static inline u16 musb_h_flush_rxfifo(struct musb_hw_ep *hw_ep, u16 csr)* PIO RX for a packet (or part of it). */ static u8 musb_host_packet_rx (struct musb *musb,struct urb *urb, -u8 epnum,u8 bIsochError) +u8 epnum,u8 iso_err) {u16 rx_count;u8 *buf;
@@ -492,7 +492,7 @@ static u8 musb_host_packet_rx(struct musb *musb, struct urb *urb,int status =0 ;struct usb_iso_packet_descriptor *d; -if (bIsochError) { +if (iso_err) { status = -EILSEQ ; urb->error_count++; }
@@ -1387,7 +1387,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)void __iomem *mbase = musb->mregs;int pipe;u16 rx_csr, wVal; -u8 bIsochError = FALSE; +u8 iso_err = FALSE;u8 done = FALSE;u32 status;struct dma_channel *dma;
@@ -1452,7 +1452,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) }else {DBG (4 ,"RX end %d ISO data error\n" , epnum);/* packet error reported later */ - bIsochError = TRUE; + iso_err = TRUE; } }
@@ -1634,7 +1634,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)if (!dma) { done =musb_host_packet_rx (musb, urb, - epnum, bIsochError); + epnum, iso_err);DBG (6 ,"read %spacket\n" , done ?"last " :"" ); } }
Signature · 1 line
1.5.2.3
PATCH 21/36 musb_hdrc: Search and replace wVal with val, except for wValue
Search and replace wVal with val, except for wValue
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)
drivers/usb/musb/musb_host.c +15 -15
@@ -1386,7 +1386,7 @@ void musb_host_rx(struct musb *musb, u8 epnum)size_t xfer_len;void __iomem *mbase = musb->mregs;int pipe; -u16 rx_csr, wVal; +u16 rx_csr, val;u8 iso_err = FALSE;u8 done = FALSE;u32 status;
@@ -1399,14 +1399,14 @@ void musb_host_rx(struct musb *musb, u8 epnum) status =0 ; xfer_len =0 ; - wVal = rx_csr =musb_readw (epio,MUSB_RXCSR ); + val = rx_csr =musb_readw (epio,MUSB_RXCSR );if (unlikely (!urb)) {/* REVISIT -- THIS SHOULD NEVER HAPPEN ... but, at least * usbtest #11 (unlinks) triggers it regularly, sometimes * with fifo full. (Only with DMA??) */ -DBG (3 ,"BOGUS RX%d ready, csr %04x, count %d\n" , epnum, wVal, +DBG (3 ,"BOGUS RX%d ready, csr %04x, count %d\n" , epnum, val,musb_readw (epio,MUSB_RXCOUNT ));musb_h_flush_rxfifo (hw_ep,MUSB_RXCSR_CLRDATATOG );return ;
@@ -1509,11 +1509,11 @@ void musb_host_rx(struct musb *musb, u8 epnum)if (dma && (rx_csr &MUSB_RXCSR_DMAENAB )) { xfer_len = dma->actual_len; - wVal &= ~(MUSB_RXCSR_DMAENAB + val &= ~(MUSB_RXCSR_DMAENAB |MUSB_RXCSR_H_AUTOREQ |MUSB_RXCSR_AUTOCLEAR |MUSB_RXCSR_RXPKTRDY ); -musb_writew (hw_ep->regs,MUSB_RXCSR , wVal); +musb_writew (hw_ep->regs,MUSB_RXCSR , val);#ifdef CONFIG_USB_INVENTRA_DMA /* done if urb buffer is full or short packet is recd */
@@ -1523,9 +1523,9 @@ void musb_host_rx(struct musb *musb, u8 epnum)/* send IN token for next packet, without AUTOREQ */ if (!done) { - wVal |=MUSB_RXCSR_H_REQPKT ; + val |=MUSB_RXCSR_H_REQPKT ;musb_writew (epio,MUSB_RXCSR , -MUSB_RXCSR_H_WZC_BITS | wVal); +MUSB_RXCSR_H_WZC_BITS | val); } DBG(4, "ep %d dma %s, rxcsr %04x, rxcount %d\n", epnum,
@@ -1546,8 +1546,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)// SCRUB (RX) /* do the proper sequence to abort the transfer */ musb_ep_select (mbase, epnum); - wVal &= ~MUSB_RXCSR_H_REQPKT ; -musb_writew (epio,MUSB_RXCSR , wVal); + val &= ~MUSB_RXCSR_H_REQPKT ; +musb_writew (epio,MUSB_RXCSR , val); goto finish; }
@@ -1599,17 +1599,17 @@ void musb_host_rx(struct musb *musb, u8 epnum)* wait for an interrupt when the pkt is recd. Well, you won't get any! */ - wVal =musb_readw (epio,MUSB_RXCSR ); - wVal &= ~MUSB_RXCSR_H_REQPKT ; + val =musb_readw (epio,MUSB_RXCSR ); + val &= ~MUSB_RXCSR_H_REQPKT ;if (dma->desired_mode ==0 ) - wVal &= ~MUSB_RXCSR_H_AUTOREQ ; + val &= ~MUSB_RXCSR_H_AUTOREQ ;else - wVal |=MUSB_RXCSR_H_AUTOREQ ; - wVal |=MUSB_RXCSR_AUTOCLEAR |MUSB_RXCSR_DMAENAB ; + val |=MUSB_RXCSR_H_AUTOREQ ; + val |=MUSB_RXCSR_AUTOCLEAR |MUSB_RXCSR_DMAENAB ;musb_writew (epio,MUSB_RXCSR , -MUSB_RXCSR_H_WZC_BITS | wVal); +MUSB_RXCSR_H_WZC_BITS | val);/* REVISIT if when actual_length != 0, * transfer_buffer_length needs to be
Signature · 1 line
1.5.2.3
PATCH 22/36 musb_hdrc: Search and replace wBestDiff with best_diff
Search and replace wBestDiff with best_diff
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/usb/musb/musb_host.c +4 -4
@@ -1660,7 +1660,7 @@ static int musb_schedule( int is_in) {int idle; -int wBestDiff; +int best_diff;int nBestEnd, nEnd;struct musb_hw_ep *hw_ep =NULL ;struct list_head *head =NULL ;
@@ -1703,7 +1703,7 @@ static int musb_schedule(* that simplistic approach makes TT scheduling a lot simpler; * there is none, and thus none of its complexity... */ - wBestDiff =4096 ; + best_diff =4096 ; nBestEnd =-1 ;for (nEnd =1 ; nEnd < musb->nr_endpoints; nEnd++) {
@@ -1720,8 +1720,8 @@ static int musb_schedule(else diff = hw_ep->max_packet_sz_tx - qh->maxpacket; -if (diff >0 && wBestDiff > diff) { - wBestDiff = diff; +if (diff >0 && best_diff > diff) { + best_diff = diff; nBestEnd = nEnd; } }
Signature · 1 line
1.5.2.3
PATCH 23/36 musb_hdrc: Search and replace nBestEnd with best_end
Search and replace nBestEnd with best_end
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/usb/musb/musb_host.c +7 -7
@@ -1661,7 +1661,7 @@ static int musb_schedule( {int idle;int best_diff; -int nBestEnd, nEnd; +int best_end, nEnd;struct musb_hw_ep *hw_ep =NULL ;struct list_head *head =NULL ;
@@ -1704,7 +1704,7 @@ static int musb_schedule(* there is none, and thus none of its complexity... */ best_diff =4096 ; - nBestEnd =-1 ; + best_end =-1 ;for (nEnd =1 ; nEnd < musb->nr_endpoints; nEnd++) {int diff;
@@ -1722,16 +1722,16 @@ static int musb_schedule(if (diff >0 && best_diff > diff) { best_diff = diff; - nBestEnd = nEnd; + best_end = nEnd; } } -if (nBestEnd <0 ) +if (best_end <0 )return -ENOSPC ; idle =1 ; - hw_ep = musb->endpoints + nBestEnd; - musb->periodic[nBestEnd] = qh; -DBG (4 ,"qh %p periodic slot %d\n" , qh, nBestEnd); + hw_ep = musb->endpoints + best_end; + musb->periodic[best_end] = qh; +DBG (4 ,"qh %p periodic slot %d\n" , qh, best_end); success: qh->hw_ep = hw_ep; qh->hep->hcpriv = qh;
Signature · 1 line
1.5.2.3
PATCH 24/36 musb_hdrc: Search and replace nEnd with epnum
Search and replace nEnd with epnum
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_gadget.c | 8 ++++---- drivers/usb/musb/musb_host.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/usb/musb/musb_gadget.c +4 -4
@@ -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 );
drivers/usb/musb/musb_host.c +5 -5
@@ -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 )
Signature · 1 line
1.5.2.3
PATCH 25/36 musb_hdrc: Search and replace wFrame with frame
Search and replace wFrame with frame
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 6 +++--- drivers/usb/musb/plat_uds.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/usb/musb/musb_host.c +3 -3
@@ -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... */
drivers/usb/musb/plat_uds.c +3 -3
@@ -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" : "",
Signature · 1 line
1.5.2.3
PATCH 26/36 musb_hdrc: Search and replace wRelease with hwvers
Search and replace wRelease with hwvers
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/plat_uds.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/usb/musb/plat_uds.c +5 -5
@@ -1251,7 +1251,7 @@ static int __init musb_core_init(u16 wType, struct musb *musb)#endif u8 reg;char *type; -u16 wRelease, wRelMajor, wRelMinor; +u16 hwvers, wRelMajor, wRelMinor;char aInfo[78 ], aRevision[32 ], aDate[12 ];void __iomem *mbase = musb->mregs;int status =0 ;
@@ -1326,11 +1326,11 @@ static int __init musb_core_init(u16 wType, struct musb *musb) }/* log release info */ - wRelease =musb_readw (mbase,MUSB_HWVERS ); - wRelMajor = (wRelease >>10 ) &0x1f ; - wRelMinor = wRelease &0x3ff ; + hwvers =musb_readw (mbase,MUSB_HWVERS ); + wRelMajor = (hwvers >>10 ) &0x1f ; + wRelMinor = hwvers &0x3ff ;snprintf (aRevision,32 ,"%d.%d%s" , wRelMajor, - wRelMinor, (wRelease &0x8000 ) ?"RC" :"" ); + wRelMinor, (hwvers &0x8000 ) ?"RC" :"" );printk (KERN_DEBUG "%s: %sHDRC RTL version %s %s\n" , musb_driver_name, type, aRevision, aDate);
Signature · 1 line
1.5.2.3
PATCH 27/36 musb_hdrc: Search and replace wRelMajor with rev_major
Search and replace wRelMajor with rev_major
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/plat_uds.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/usb/musb/plat_uds.c +3 -3
@@ -1251,7 +1251,7 @@ static int __init musb_core_init(u16 wType, struct musb *musb)#endif u8 reg;char *type; -u16 hwvers, wRelMajor, wRelMinor; +u16 hwvers, rev_major, wRelMinor;char aInfo[78 ], aRevision[32 ], aDate[12 ];void __iomem *mbase = musb->mregs;int status =0 ;
@@ -1327,9 +1327,9 @@ static int __init musb_core_init(u16 wType, struct musb *musb)/* log release info */ hwvers =musb_readw (mbase,MUSB_HWVERS ); - wRelMajor = (hwvers >>10 ) &0x1f ; + rev_major = (hwvers >>10 ) &0x1f ; wRelMinor = hwvers &0x3ff ; -snprintf (aRevision,32 ,"%d.%d%s" , wRelMajor, +snprintf (aRevision,32 ,"%d.%d%s" , rev_major, wRelMinor, (hwvers &0x8000 ) ?"RC" :"" );printk (KERN_DEBUG "%s: %sHDRC RTL version %s %s\n" , musb_driver_name, type, aRevision, aDate);
Signature · 1 line
1.5.2.3
PATCH 28/36 musb_hdrc: Search and replace wRelMinor with rev_minor
Search and replace wRelMinor with rev_minor
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/plat_uds.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/usb/musb/plat_uds.c +3 -3
@@ -1251,7 +1251,7 @@ static int __init musb_core_init(u16 wType, struct musb *musb)#endif u8 reg;char *type; -u16 hwvers, rev_major, wRelMinor; +u16 hwvers, rev_major, rev_minor;char aInfo[78 ], aRevision[32 ], aDate[12 ];void __iomem *mbase = musb->mregs;int status =0 ;
@@ -1328,9 +1328,9 @@ static int __init musb_core_init(u16 wType, struct musb *musb)/* log release info */ hwvers =musb_readw (mbase,MUSB_HWVERS ); rev_major = (hwvers >>10 ) &0x1f ; - wRelMinor = hwvers &0x3ff ; + rev_minor = hwvers &0x3ff ;snprintf (aRevision,32 ,"%d.%d%s" , rev_major, - wRelMinor, (hwvers &0x8000 ) ?"RC" :"" ); + rev_minor, (hwvers &0x8000 ) ?"RC" :"" );printk (KERN_DEBUG "%s: %sHDRC RTL version %s %s\n" , musb_driver_name, type, aRevision, aDate);
Signature · 1 line
1.5.2.3
PATCH 29/36 musb_hdrc: Search and replace dwData with data
Search and replace dwData with data
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/plat_uds.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/musb/plat_uds.c +8 -8
@@ -1247,7 +1247,7 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, };static int __init musb_core_init (u16 wType,struct musb *musb) {#ifdef MUSB_AHB_ID -u32 dwData; +u32 data;#endif u8 reg;char *type;
@@ -1297,14 +1297,14 @@ static int __init musb_core_init(u16 wType, struct musb *musb) musb_driver_name, reg, aInfo);#ifdef MUSB_AHB_ID - dwData =musb_readl (mbase,0x404 ); -sprintf (aDate,"%04d-%02x-%02x" , (dwData &0xffff ), - (dwData >>16 ) &0xff , (dwData >>24 ) &0xff ); + data =musb_readl (mbase,0x404 ); +sprintf (aDate,"%04d-%02x-%02x" , (data &0xffff ), + (data >>16 ) &0xff , (data >>24 ) &0xff );/* FIXME ID2 and ID3 are unused */ - dwData =musb_readl (mbase,0x408 ); -printk ("ID2=%lx\n" , (long unsigned )dwData); - dwData =musb_readl (mbase,0x40c ); -printk ("ID3=%lx\n" , (long unsigned )dwData); + data =musb_readl (mbase,0x408 ); +printk ("ID2=%lx\n" , (long unsigned )data); + data =musb_readl (mbase,0x40c ); +printk ("ID3=%lx\n" , (long unsigned )data); reg =musb_readb (mbase,0x400 ); wType = ('M' == reg) ?MUSB_CONTROLLER_MHDRC :MUSB_CONTROLLER_HDRC ;#else
Signature · 1 line
1.5.2.3
PATCH 30/36 musb_hdrc: Search and replace pController with controller
Search and replace pController with controller
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/cppi_dma.c | 128 +++++++++++++++++++++--------------------- drivers/usb/musb/cppi_dma.h | 2 +- drivers/usb/musb/musbhsdma.c | 82 +++++++++++++------------- 3 files changed, 106 insertions(+), 106 deletions(-)
drivers/usb/musb/cppi_dma.c +64 -64
@@ -100,7 +100,7 @@ static void __init cppi_pool_init(struct cppi *cppi, struct cppi_channel *c) c->activeQueueTail =NULL ; c->lastHwBDProcessed =NULL ; c->Channel.status =MGC_DMA_STATUS_UNKNOWN ; - c->pController = cppi; + c->controller = cppi; c->bLastModeRndis =0 ; c->Channel.private_data = c; c->bdPoolHead =NULL ;
@@ -120,12 +120,12 @@ static int cppi_channel_abort(struct dma_channel *);static void cppi_pool_free (struct cppi_channel *c) { -struct cppi *cppi = c->pController; +struct cppi *cppi = c->controller;struct cppi_descriptor *bd; (void )cppi_channel_abort (&c->Channel); c->Channel.status =MGC_DMA_STATUS_UNKNOWN ; - c->pController =NULL ; + c->controller =NULL ;/* free all its bds */ bd = c->lastHwBDProcessed;
@@ -139,36 +139,36 @@ static void cppi_pool_free(struct cppi_channel *c)static int __init cppi_controller_start (struct dma_controller *c) { -struct cppi *pController; +struct cppi *controller;void *__iomem regBase;int i; - pController = container_of(c, struct cppi, Controller); + controller = container_of(c, struct cppi, Controller);/* do whatever is necessary to start controller */ -for (i =0 ; i <ARRAY_SIZE (pController->txCppi); i++) { - pController->txCppi[i].transmit = TRUE; - pController->txCppi[i].chNo = i; +for (i =0 ; i <ARRAY_SIZE (controller->txCppi); i++) { + controller->txCppi[i].transmit = TRUE; + controller->txCppi[i].chNo = i; } -for (i =0 ; i <ARRAY_SIZE (pController->rxCppi); i++) { - pController->rxCppi[i].transmit = FALSE; - pController->rxCppi[i].chNo = i; +for (i =0 ; i <ARRAY_SIZE (controller->rxCppi); i++) { + controller->rxCppi[i].transmit = FALSE; + controller->rxCppi[i].chNo = i; }/* setup BD list on a per channel basis */ -for (i =0 ; i <ARRAY_SIZE (pController->txCppi); i++) -cppi_pool_init (pController, pController->txCppi + i); -for (i =0 ; i <ARRAY_SIZE (pController->rxCppi); i++) -cppi_pool_init (pController, pController->rxCppi + i); +for (i =0 ; i <ARRAY_SIZE (controller->txCppi); i++) +cppi_pool_init (controller, controller->txCppi + i); +for (i =0 ; i <ARRAY_SIZE (controller->rxCppi); i++) +cppi_pool_init (controller, controller->rxCppi + i);/* Do Necessary configuartion in H/w to get started */ - regBase = pController->pCoreBase -DAVINCI_BASE_OFFSET ; + regBase = controller->pCoreBase -DAVINCI_BASE_OFFSET ; -INIT_LIST_HEAD (&pController->tx_complete); +INIT_LIST_HEAD (&controller->tx_complete);/* initialise tx/rx channel head pointers to zero */ -for (i =0 ; i <ARRAY_SIZE (pController->txCppi); i++) { -struct cppi_channel *txChannel = pController->txCppi + i; +for (i =0 ; i <ARRAY_SIZE (controller->txCppi); i++) { +struct cppi_channel *txChannel = controller->txCppi + i;struct cppi_tx_stateram *__iomem txState;INIT_LIST_HEAD (&txChannel->tx_complete);
@@ -186,8 +186,8 @@ static int __init cppi_controller_start(struct dma_controller *c) txState->completionPtr =0 ; } -for (i =0 ; i <ARRAY_SIZE (pController->rxCppi); i++) { -struct cppi_channel *rxChannel = pController->rxCppi + i; +for (i =0 ; i <ARRAY_SIZE (controller->rxCppi); i++) { +struct cppi_channel *rxChannel = controller->rxCppi + i;struct cppi_rx_stateram *__iomem rxState;INIT_LIST_HEAD (&rxChannel->tx_complete);
@@ -222,13 +222,13 @@ static int __init cppi_controller_start(struct dma_controller *c)static int cppi_controller_stop (struct dma_controller *c) { -struct cppi *pController; +struct cppi *controller;void __iomem *regBase;int i; - pController = container_of(c, struct cppi, Controller); + controller = container_of(c, struct cppi, Controller); - regBase = pController->pCoreBase -DAVINCI_BASE_OFFSET ; + regBase = controller->pCoreBase -DAVINCI_BASE_OFFSET ;/* DISABLE INDIVIDUAL CHANNEL Interrupts */ musb_writel (regBase,DAVINCI_TXCPPI_INTCLR_REG ,DAVINCI_DMA_ALL_CHANNELS_ENABLE );
@@ -236,13 +236,13 @@ static int cppi_controller_stop(struct dma_controller *c) DAVINCI_DMA_ALL_CHANNELS_ENABLE);DBG (1 ,"Tearing down RX and TX Channels\n" ); -for (i =0 ; i <ARRAY_SIZE (pController->txCppi); i++) { +for (i =0 ; i <ARRAY_SIZE (controller->txCppi); i++) {/* FIXME restructure of txdma to use bds like rxdma */ - pController->txCppi[i].lastHwBDProcessed =NULL ; -cppi_pool_free (pController->txCppi + i); + controller->txCppi[i].lastHwBDProcessed =NULL ; +cppi_pool_free (controller->txCppi + i); } -for (i =0 ; i <ARRAY_SIZE (pController->rxCppi); i++) -cppi_pool_free (pController->rxCppi + i); +for (i =0 ; i <ARRAY_SIZE (controller->rxCppi); i++) +cppi_pool_free (controller->rxCppi + i);/* in Tx Case proper teardown is supported. We resort to disabling * Tx/Rx CPPI after cleanup of Tx channels. Before TX teardown is
@@ -285,14 +285,14 @@ cppi_channel_allocate(struct dma_controller *c, struct musb_hw_ep *ep, u8 transmit) { -struct cppi *pController; +struct cppi *controller;u8 chNum;struct cppi_channel *otgCh;void __iomem *tibase;int local_end = ep->epnum; - pController = container_of(c, struct cppi, Controller); - tibase = pController->pCoreBase -DAVINCI_BASE_OFFSET ; + controller = container_of(c, struct cppi, Controller); + tibase = controller->pCoreBase -DAVINCI_BASE_OFFSET ;/* remember local_end: 1..Max_EndPt, and cppi ChNum:0..Max_EndPt-1 */ chNum = local_end -1 ;
@@ -301,17 +301,17 @@ cppi_channel_allocate(struct dma_controller *c,* probably disable the non-CPPI irq until we need it. */ if (transmit) { -if (local_end >ARRAY_SIZE (pController->txCppi)) { +if (local_end >ARRAY_SIZE (controller->txCppi)) {DBG (1 ,"no %cX DMA channel for ep%d\n" ,'T' , local_end);return NULL ; } - otgCh = pController->txCppi + chNum; + otgCh = controller->txCppi + chNum; }else { -if (local_end >ARRAY_SIZE (pController->rxCppi)) { +if (local_end >ARRAY_SIZE (controller->rxCppi)) {DBG (1 ,"no %cX DMA channel for ep%d\n" ,'R' , local_end);return NULL ; } - otgCh = pController->rxCppi + chNum; + otgCh = controller->rxCppi + chNum;core_rxirq_disable (tibase, local_end); }
@@ -340,7 +340,7 @@ static void cppi_channel_release(struct dma_channel *channel) c = container_of(channel, struct cppi_channel, Channel); epnum = c->chNo +1 ; - tibase = c->pController->pCoreBase -DAVINCI_BASE_OFFSET ; + tibase = c->controller->pCoreBase -DAVINCI_BASE_OFFSET ;if (!c->hw_ep)DBG (1 ,"releasing idle DMA channel %p\n" , c);else if (!c->transmit)
@@ -355,7 +355,7 @@ static void cppi_channel_release(struct dma_channel *channel)static void cppi_dump_rx (int level,struct cppi_channel *c,const char *tag) { -void *__iomem base = c->pController->pCoreBase; +void *__iomem base = c->controller->pCoreBase;musb_ep_select (base, c->chNo +1 );
@@ -384,7 +384,7 @@ cppi_dump_rx(int level, struct cppi_channel *c, const char *tag)static void cppi_dump_tx (int level,struct cppi_channel *c,const char *tag) { -void *__iomem base = c->pController->pCoreBase; +void *__iomem base = c->controller->pCoreBase;musb_ep_select (base, c->chNo +1 );
@@ -954,8 +954,8 @@ static int cppi_channel_program(struct dma_channel *pChannel, dma_addr_t dma_addr, u32 len) {struct cppi_channel *otgChannel = pChannel->private_data; -struct cppi *pController = otgChannel->pController; -struct musb *musb = pController->musb; +struct cppi *controller = otgChannel->controller; +struct musb *musb = controller->musb;switch (pChannel->status) {case MGC_DMA_STATUS_BUS_ABORT :
@@ -1307,38 +1307,38 @@ void cppi_completion(struct musb *musb, u32 rx, u32 tx)struct dma_controller *__init dma_controller_create (struct musb *musb,void __iomem *pCoreBase) { -struct cppi *pController; +struct cppi *controller; - pController =kzalloc (sizeof *pController,GFP_KERNEL ); -if (!pController) + controller =kzalloc (sizeof *controller,GFP_KERNEL ); +if (!controller)return NULL ;/* Initialize the Cppi DmaController structure */ - pController->pCoreBase = pCoreBase; - pController->musb = musb; - pController->Controller.private_data = pController; - pController->Controller.start = cppi_controller_start; - pController->Controller.stop = cppi_controller_stop; - pController->Controller.channel_alloc = cppi_channel_allocate; - pController->Controller.channel_release = cppi_channel_release; - pController->Controller.channel_program = cppi_channel_program; - pController->Controller.channel_abort = cppi_channel_abort; + controller->pCoreBase = pCoreBase; + controller->musb = musb; + controller->Controller.private_data = controller; + controller->Controller.start = cppi_controller_start; + controller->Controller.stop = cppi_controller_stop; + controller->Controller.channel_alloc = cppi_channel_allocate; + controller->Controller.channel_release = cppi_channel_release; + controller->Controller.channel_program = cppi_channel_program; + controller->Controller.channel_abort = cppi_channel_abort;/* NOTE: allocating from on-chip SRAM would give the least * contention for memory access, if that ever matters here. */ /* setup BufferPool */ - pController->pool =dma_pool_create ("cppi" , - pController->musb->controller, + controller->pool =dma_pool_create ("cppi" , + controller->musb->controller,sizeof (struct cppi_descriptor ),CPPI_DESCRIPTOR_ALIGN ,0 ); -if (!pController->pool) { -kfree (pController); +if (!controller->pool) { +kfree (controller);return NULL ; } -return &pController->Controller; +return &controller->Controller; }/*
@@ -1362,7 +1362,7 @@ void dma_controller_destroy(struct dma_controller *c)static int cppi_channel_abort (struct dma_channel *channel) {struct cppi_channel *otgCh; -struct cppi *pController; +struct cppi *controller;int chNum;void *__iomem mbase;void *__iomem regBase;
@@ -1372,7 +1372,7 @@ static int cppi_channel_abort(struct dma_channel *channel) otgCh = container_of(channel, struct cppi_channel, Channel); - pController = otgCh->pController; + controller = otgCh->controller; chNum = otgCh->chNo;switch (channel->status) {
@@ -1393,7 +1393,7 @@ static int cppi_channel_abort(struct dma_channel *channel)if (!otgCh->transmit && otgCh->activeQueueHead)cppi_dump_rxq (3 ,"/abort" , otgCh); - mbase = pController->pCoreBase; + mbase = controller->pCoreBase; regBase = mbase -DAVINCI_BASE_OFFSET ; queue = otgCh->activeQueueHead;
@@ -1490,7 +1490,7 @@ static int cppi_channel_abort(struct dma_channel *channel)core_rxirq_disable (regBase, otgCh->chNo +1 );/* for host, ensure ReqPkt is never set again */ -if (is_host_active (otgCh->pController->musb)) { +if (is_host_active (otgCh->controller->musb)) { regVal =musb_readl (regBase,DAVINCI_AUTOREQ_REG ); regVal &= ~((0x3 ) << (otgCh->chNo *2 ));musb_writel (regBase,DAVINCI_AUTOREQ_REG , regVal);
@@ -1499,7 +1499,7 @@ static int cppi_channel_abort(struct dma_channel *channel) csr =musb_readw (regs,MUSB_RXCSR );/* for host, clear (just) ReqPkt at end of current packet(s) */ -if (is_host_active (otgCh->pController->musb)) { +if (is_host_active (otgCh->controller->musb)) { csr |=MUSB_RXCSR_H_WZC_BITS ; csr &= ~MUSB_RXCSR_H_REQPKT ; }else
@@ -1521,7 +1521,7 @@ static int cppi_channel_abort(struct dma_channel *channel)/* scan the current list, reporting any data that was * transferred and acking any IRQ */ -cppi_rx_scan (pController, chNum); +cppi_rx_scan (controller, chNum);/* clobber the existing state once it's idle *
drivers/usb/musb/cppi_dma.h +1 -1
@@ -62,7 +62,7 @@ struct cppi_channel {struct dma_channel Channel;/* back pointer to the Dma Controller structure */ -struct cppi *pController; +struct cppi *controller;/* which direction of which endpoint? */ struct musb_hw_ep *hw_ep;
drivers/usb/musb/musbhsdma.c +41 -41
183 lines not on this page · raw message
Signature · 1 line
1.5.2.3
PATCH 31/36 musb_hdrc: Search and replace wType with musb_type
Search and replace wType with musb_type
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/plat_uds.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/usb/musb/plat_uds.c +3 -3
@@ -1244,7 +1244,7 @@ enum { MUSB_CONTROLLER_MHDRC, MUSB_CONTROLLER_HDRC, };/* Initialize MUSB (M)HDRC part of the USB hardware subsystem; * configure endpoints, or take their config from silicon */ -static int __init musb_core_init (u16 wType,struct musb *musb) +static int __init musb_core_init (u16 musb_type,struct musb *musb) {#ifdef MUSB_AHB_ID u32 data;
@@ -1306,11 +1306,11 @@ static int __init musb_core_init(u16 wType, struct musb *musb) data =musb_readl (mbase,0x40c );printk ("ID3=%lx\n" , (long unsigned )data); reg =musb_readb (mbase,0x400 ); - wType = ('M' == reg) ?MUSB_CONTROLLER_MHDRC :MUSB_CONTROLLER_HDRC ; + musb_type = ('M' == reg) ?MUSB_CONTROLLER_MHDRC :MUSB_CONTROLLER_HDRC ;#else aDate[0 ] =0 ;#endif -if (MUSB_CONTROLLER_MHDRC == wType) { +if (MUSB_CONTROLLER_MHDRC == musb_type) { musb->is_multipoint =1 ; type ="M" ; }else {
Signature · 1 line
1.5.2.3
PATCH 32/36 musb_hdrc: Search and replace bReg with reg
Search and replace bReg with reg
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_procfs.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)
drivers/usb/musb/musb_procfs.c +18 -18
@@ -652,7 +652,7 @@ static int musb_proc_write(struct file *file, const char __user *buffer, unsigned long count, void *data) { char cmd; -u8 bReg; +u8 reg;struct musb *musb = (struct musb *)data;void __iomem *mbase = musb->mregs;
@@ -664,47 +664,47 @@ static int musb_proc_write(struct file *file, const char __user *buffer,switch (cmd) {case 'C' :if (mbase) { - bReg =musb_readb (mbase,MUSB_POWER ) + reg =musb_readb (mbase,MUSB_POWER ) |MUSB_POWER_SOFTCONN ; -musb_writeb (mbase,MUSB_POWER , bReg); +musb_writeb (mbase,MUSB_POWER , reg); }break ;case 'c' :if (mbase) { - bReg =musb_readb (mbase,MUSB_POWER ) + reg =musb_readb (mbase,MUSB_POWER ) & ~MUSB_POWER_SOFTCONN ; -musb_writeb (mbase,MUSB_POWER , bReg); +musb_writeb (mbase,MUSB_POWER , reg); }break ;case 'I' :if (mbase) { - bReg =musb_readb (mbase,MUSB_POWER ) + reg =musb_readb (mbase,MUSB_POWER ) |MUSB_POWER_HSENAB ; -musb_writeb (mbase,MUSB_POWER , bReg); +musb_writeb (mbase,MUSB_POWER , reg); }break ;case 'i' :if (mbase) { - bReg =musb_readb (mbase,MUSB_POWER ) + reg =musb_readb (mbase,MUSB_POWER ) & ~MUSB_POWER_HSENAB ; -musb_writeb (mbase,MUSB_POWER , bReg); +musb_writeb (mbase,MUSB_POWER , reg); }break ;case 'F' : - bReg =musb_readb (mbase,MUSB_DEVCTL ); - bReg |=MUSB_DEVCTL_SESSION ; -musb_writeb (mbase,MUSB_DEVCTL , bReg); + reg =musb_readb (mbase,MUSB_DEVCTL ); + reg |=MUSB_DEVCTL_SESSION ; +musb_writeb (mbase,MUSB_DEVCTL , reg);break ;case 'H' :if (mbase) { - bReg =musb_readb (mbase,MUSB_DEVCTL ); - bReg |=MUSB_DEVCTL_HR ; -musb_writeb (mbase,MUSB_DEVCTL , bReg); + reg =musb_readb (mbase,MUSB_DEVCTL ); + reg |=MUSB_DEVCTL_HR ; +musb_writeb (mbase,MUSB_DEVCTL , reg);//MUSB_HST_MODE( ((struct musb*)data) ); //WARN("Host Mode\n"); }
@@ -712,9 +712,9 @@ static int musb_proc_write(struct file *file, const char __user *buffer,case 'h' :if (mbase) { - bReg =musb_readb (mbase,MUSB_DEVCTL ); - bReg &= ~MUSB_DEVCTL_HR ; -musb_writeb (mbase,MUSB_DEVCTL , bReg); + reg =musb_readb (mbase,MUSB_DEVCTL ); + reg &= ~MUSB_DEVCTL_HR ; +musb_writeb (mbase,MUSB_DEVCTL , reg); }break ;
Signature · 1 line
1.5.2.3
PATCH 33/36 musb_hdrc: Search and replace bMore with more
Search and replace bMore with more
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/usb/musb/musb_host.c +6 -6
@@ -945,7 +945,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum,static int musb_h_ep0_continue (struct musb *musb,u16 len,struct urb *urb) { -int bMore = FALSE; +int more = FALSE;u8 *fifo_dest =NULL ;u16 fifo_count =0 ;struct musb_hw_ep *hw_ep = musb->control_ep;
@@ -969,7 +969,7 @@ static int musb_h_ep0_continue(struct musb *musb,*/ }else if (urb->actual_length < urb->transfer_buffer_length) - bMore = TRUE; + more = TRUE;break ;case MGC_END0_START : request = (struct usb_ctrlrequest *) urb->setup_packet;
@@ -980,12 +980,12 @@ static int musb_h_ep0_continue(struct musb *musb, }else if (request->bRequestType &USB_DIR_IN ) {DBG (4 ,"start IN-DATA\n" ); musb->ep0_stage =MGC_END0_IN ; - bMore = TRUE; + more = TRUE;break ; }else {DBG (4 ,"start OUT-DATA\n" ); musb->ep0_stage =MGC_END0_OUT ; - bMore = TRUE; + more = TRUE; }/* FALLTHROUGH */ case MGC_END0_OUT :
@@ -1001,7 +1001,7 @@ static int musb_h_ep0_continue(struct musb *musb,musb_write_fifo (hw_ep, fifo_count, fifo_dest); urb->actual_length += fifo_count; - bMore = TRUE; + more = TRUE; }break ;default :
@@ -1009,7 +1009,7 @@ static int musb_h_ep0_continue(struct musb *musb,break ; } -return bMore; +return more; }/*
Signature · 1 line
1.5.2.3
PATCH 34/36 musb_hdrc: Search and replace bComplete with complete
Search and replace bComplete with complete
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/musb_host.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/usb/musb/musb_host.c +5 -5
@@ -1027,7 +1027,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)struct musb_hw_ep *hw_ep = musb->control_ep;void __iomem *epio = hw_ep->regs;struct musb_qh *qh = hw_ep->in_qh; -u8 bComplete = FALSE; +u8 complete = FALSE;irqreturn_t retval =IRQ_NONE ;/* ep0 only has one queue, "in" */
@@ -1045,7 +1045,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb)/* if we just did status stage, we are done */ if (MGC_END0_STATUS == musb->ep0_stage) { retval =IRQ_HANDLED ; - bComplete = TRUE; + complete = TRUE; }/* prepare status */
@@ -1076,7 +1076,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) retval =IRQ_HANDLED ;if (urb) urb->status = status; - bComplete = TRUE; + complete = TRUE;/* use the proper sequence to abort the transfer */ if (csr &MUSB_CSR0_H_REQPKT ) {
@@ -1110,7 +1110,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) goto done; } -if (!bComplete) { +if (!complete) {/* call common logic and prepare response */ if (musb_h_ep0_continue (musb, len, urb)) {/* more packets required */
@@ -1138,7 +1138,7 @@ irqreturn_t musb_h_ep0_irq(struct musb *musb) musb->ep0_stage =MGC_END0_IDLE ;/* call completion handler if done */ -if (bComplete) +if (complete)musb_advance_schedule (musb, urb, hw_ep,1 ); done:return retval;
Signature · 1 line
1.5.2.3
PATCH 35/36 musb_hdrc: Get rid of unnecessary DMA typedef & fix a comment typo
Get rid of unnecessary DMA typedef & fix a comment typo
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/dma.h | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-)
drivers/usb/musb/dma.h +5 -23
@@ -102,7 +102,7 @@ struct dma_controller;/** * struct dma_channel - A DMA channel. * @private_data: channel-private data -* @wMaxLength: the maximum number of bytes the channel can move in one +* @max_len: the maximum number of bytes the channel can move in one * transaction (typically representing many USB maximum-sized packets) * @actual_len: how many bytes have been transferred * @status: current channel status (updated e.g. on interrupt)
@@ -121,27 +121,6 @@ struct dma_channel { };/* -* Program a DMA channel to move data at the core's request. -* The local core endpoint and direction should already be known, -* since they are specified in the channel_alloc call. -* -* @channel: pointer to a channel obtained by channel_alloc -* @maxpacket: the maximum packet size -* @mode: TRUE if mode 1; FALSE if mode 0 -* @dma_addr: base address of data (in DMA space) -* @length: the number of bytes to transfer; no larger than the channel's -* reported max_len -* -* Returns TRUE on success, else FALSE -*/ -typedef int (*dma_program_channel ) ( -struct dma_channel *channel, -u16 maxpacket, -u8 mode, -dma_addr_t dma_addr, -u32 length); - -/* * dma_channel_status - return status of dma channel * @c: the channel *
@@ -176,7 +155,10 @@ struct dma_controller {struct dma_channel *(*channel_alloc)(struct dma_controller *,struct musb_hw_ep *,u8 is_tx);void (*channel_release)(struct dma_channel *); -dma_program_channel channel_program; +int (*channel_program)(struct dma_channel *channel, +u16 maxpacket,u8 mode, +dma_addr_t dma_addr, +u32 length);int (*channel_abort)(struct dma_channel *); };
Signature · 1 line
1.5.2.3
PATCH 36/36 musb_hdrc: Search and replace MGC_DMA with MUSB_DMA
Search and replace MGC_DMA with MUSB_DMA
Signed-off-by Tony Lindgren <[email protected]>
--- drivers/usb/musb/cppi_dma.c | 38 +++++++++++++++++++------------------- drivers/usb/musb/dma.h | 12 ++++++------ drivers/usb/musb/musb_gadget.c | 14 +++++++------- drivers/usb/musb/musb_host.c | 16 ++++++++-------- drivers/usb/musb/musbhsdma.c | 18 +++++++++--------- drivers/usb/musb/tusb6010_omap.c | 16 ++++++++-------- 6 files changed, 57 insertions(+), 57 deletions(-)
drivers/usb/musb/cppi_dma.c +19 -19
@@ -99,7 +99,7 @@ static void __init cppi_pool_init(struct cppi *cppi, struct cppi_channel *c) c->activeQueueHead =NULL ; c->activeQueueTail =NULL ; c->lastHwBDProcessed =NULL ; - c->Channel.status =MGC_DMA_STATUS_UNKNOWN ; + c->Channel.status =MUSB_DMA_STATUS_UNKNOWN ; c->controller = cppi; c->bLastModeRndis =0 ; c->Channel.private_data = c;
@@ -124,7 +124,7 @@ static void cppi_pool_free(struct cppi_channel *c)struct cppi_descriptor *bd; (void )cppi_channel_abort (&c->Channel); - c->Channel.status =MGC_DMA_STATUS_UNKNOWN ; + c->Channel.status =MUSB_DMA_STATUS_UNKNOWN ; c->controller =NULL ;/* free all its bds */
@@ -322,7 +322,7 @@ cppi_channel_allocate(struct dma_controller *c,DBG (1 ,"re-allocating DMA%d %cX channel %p\n" , chNum, transmit ?'T' :'R' , otgCh); otgCh->hw_ep = ep; - otgCh->Channel.status =MGC_DMA_STATUS_FREE ; + otgCh->Channel.status =MUSB_DMA_STATUS_FREE ;DBG (4 ,"Allocate CPPI%d %cX\n" , chNum, transmit ?'T' :'R' ); otgCh->Channel.private_data = otgCh;
@@ -348,7 +348,7 @@ static void cppi_channel_release(struct dma_channel *channel)/* for now, leave its cppi IRQ enabled (we won't trigger it) */ c->hw_ep =NULL ; - channel->status =MGC_DMA_STATUS_UNKNOWN ; + channel->status =MUSB_DMA_STATUS_UNKNOWN ; }/* Context: controller irqlocked */
@@ -958,30 +958,30 @@ static int cppi_channel_program(struct dma_channel *pChannel,struct musb *musb = controller->musb;switch (pChannel->status) { -case MGC_DMA_STATUS_BUS_ABORT : -case MGC_DMA_STATUS_CORE_ABORT : +case MUSB_DMA_STATUS_BUS_ABORT : +case MUSB_DMA_STATUS_CORE_ABORT :/* fault irq handler should have handled cleanup */ WARN ("%cX DMA%d not cleaned up after abort!\n" , otgChannel->transmit ?'T' :'R' , otgChannel->chNo);//WARN_ON(1); break ; -case MGC_DMA_STATUS_BUSY : +case MUSB_DMA_STATUS_BUSY :WARN ("program active channel? %cX DMA%d\n" , otgChannel->transmit ?'T' :'R' , otgChannel->chNo);//WARN_ON(1); break ; -case MGC_DMA_STATUS_UNKNOWN : +case MUSB_DMA_STATUS_UNKNOWN :DBG (1 ,"%cX DMA%d not allocated!\n" , otgChannel->transmit ?'T' :'R' , otgChannel->chNo);/* FALLTHROUGH */ -case MGC_DMA_STATUS_FREE : +case MUSB_DMA_STATUS_FREE :break ; } - pChannel->status =MGC_DMA_STATUS_BUSY ; + pChannel->status =MUSB_DMA_STATUS_BUSY ;/* set transfer parameters, then queue up its first segment */ otgChannel->startAddr = dma_addr;
@@ -1225,7 +1225,7 @@ void cppi_completion(struct musb *musb, u32 rx, u32 tx) txChannel->activeQueueHead =NULL ; txChannel->activeQueueTail =NULL ; txChannel->Channel.status = -MGC_DMA_STATUS_FREE ; +MUSB_DMA_STATUS_FREE ; hw_ep = txChannel->hw_ep;
@@ -1288,7 +1288,7 @@ void cppi_completion(struct musb *musb, u32 rx, u32 tx) }/* all segments completed! */ - rxChannel->Channel.status =MGC_DMA_STATUS_FREE ; + rxChannel->Channel.status =MUSB_DMA_STATUS_FREE ; hw_ep = rxChannel->hw_ep;
@@ -1376,15 +1376,15 @@ static int cppi_channel_abort(struct dma_channel *channel) chNum = otgCh->chNo;switch (channel->status) { -case MGC_DMA_STATUS_BUS_ABORT : -case MGC_DMA_STATUS_CORE_ABORT : +case MUSB_DMA_STATUS_BUS_ABORT : +case MUSB_DMA_STATUS_CORE_ABORT :/* from RX or TX fault irq handler */ -case MGC_DMA_STATUS_BUSY : +case MUSB_DMA_STATUS_BUSY :/* the hardware needs shutting down */ regs = otgCh->hw_ep->regs;break ; -case MGC_DMA_STATUS_UNKNOWN : -case MGC_DMA_STATUS_FREE : +case MUSB_DMA_STATUS_UNKNOWN : +case MUSB_DMA_STATUS_FREE :return 0 ;default :return -EINVAL ;
@@ -1515,7 +1515,7 @@ static int cppi_channel_abort(struct dma_channel *channel)* refers to an entire "DMA packet" not just emptying the * current fifo; most segments need multiple usb packets. */ -if (channel->status ==MGC_DMA_STATUS_BUSY ) +if (channel->status ==MUSB_DMA_STATUS_BUSY )udelay (50 );/* scan the current list, reporting any data that was
@@ -1552,7 +1552,7 @@ static int cppi_channel_abort(struct dma_channel *channel) } } - channel->status =MGC_DMA_STATUS_FREE ; + channel->status =MUSB_DMA_STATUS_FREE ; otgCh->startAddr =0 ; otgCh->currOffset =0 ; otgCh->transferSize =0 ;
drivers/usb/musb/dma.h +6 -6
@@ -86,15 +86,15 @@ struct musb_hw_ep;*/ enum dma_channel_status {/* unallocated */ -MGC_DMA_STATUS_UNKNOWN , +MUSB_DMA_STATUS_UNKNOWN ,/* allocated ... but not busy, no errors */ -MGC_DMA_STATUS_FREE , +MUSB_DMA_STATUS_FREE ,/* busy ... transactions are active */ -MGC_DMA_STATUS_BUSY , +MUSB_DMA_STATUS_BUSY ,/* transaction(s) aborted due to ... dma or memory bus error */ -MGC_DMA_STATUS_BUS_ABORT , +MUSB_DMA_STATUS_BUS_ABORT ,/* transaction(s) aborted due to ... core error or USB fault */ -MGC_DMA_STATUS_CORE_ABORT +MUSB_DMA_STATUS_CORE_ABORT };struct dma_controller ;
@@ -131,7 +131,7 @@ struct dma_channel {static inline enum dma_channel_status dma_channel_status (struct dma_channel *c) { -return (is_dma_capable () && c) ? c->status :MGC_DMA_STATUS_UNKNOWN ; +return (is_dma_capable () && c) ? c->status :MUSB_DMA_STATUS_UNKNOWN ; }/**
drivers/usb/musb/musb_gadget.c +7 -7
@@ -263,7 +263,7 @@ static void txstate(struct musb *musb, struct musb_request *req) musb_ep = req->ep;/* we shouldn't get here while DMA is active ... but we do ... */ -if (dma_channel_status (musb_ep->dma) ==MGC_DMA_STATUS_BUSY ) { +if (dma_channel_status (musb_ep->dma) ==MUSB_DMA_STATUS_BUSY ) {DBG (4 ,"dma pending...\n" );return ; }
@@ -427,8 +427,8 @@ void musb_g_tx(struct musb *musb, u8 epnum) csr |=MUSB_TXCSR_P_WZC_BITS ; csr &= ~MUSB_TXCSR_P_SENTSTALL ;musb_writew (epio,MUSB_TXCSR , csr); -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { - dma->status =MGC_DMA_STATUS_CORE_ABORT ; +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) { + dma->status =MUSB_DMA_STATUS_CORE_ABORT ; musb->dma_controller->channel_abort (dma); }
@@ -447,7 +447,7 @@ void musb_g_tx(struct musb *musb, u8 epnum)DBG (20 ,"underrun on ep%d, req %p\n" , epnum, request); } -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) {/* SHOULD NOT HAPPEN ... has with cppi though, after * changing SENDSTALL (and other cases); harmless? */
@@ -753,8 +753,8 @@ void musb_g_rx(struct musb *musb, u8 epnum) csr, dma ? " (dma)" : "", request);if (csr &MUSB_RXCSR_P_SENTSTALL ) { -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { - dma->status =MGC_DMA_STATUS_CORE_ABORT ; +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) { + dma->status =MUSB_DMA_STATUS_CORE_ABORT ; (void ) musb->dma_controller->channel_abort (dma); request->actual += musb_ep->dma->actual_len; }
@@ -782,7 +782,7 @@ void musb_g_rx(struct musb *musb, u8 epnum)DBG (4 ,"%s, incomprx\n" , musb_ep->end_point.name); } -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) {/* "should not happen"; likely RXPKTRDY pending for DMA */ DBG((csr & MUSB_RXCSR_DMAENAB) ? 4 : 1, "%s busy, csr %04x\n",
drivers/usb/musb/musb_host.c +8 -8
@@ -1225,8 +1225,8 @@ void musb_host_tx(struct musb *musb, u8 epnum) }if (status) { -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { - dma->status =MGC_DMA_STATUS_CORE_ABORT ; +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) { + dma->status =MUSB_DMA_STATUS_CORE_ABORT ; (void ) musb->dma_controller->channel_abort (dma); }
@@ -1251,7 +1251,7 @@ void musb_host_tx(struct musb *musb, u8 epnum) }/* second cppi case */ -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) {DBG (4 ,"extra TX%d ready, csr %04x\n" , epnum, tx_csr); goto finish;
@@ -1459,8 +1459,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)/* faults abort the transfer */ if (status) {/* clean up dma and collect transfer count */ -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { - dma->status =MGC_DMA_STATUS_CORE_ABORT ; +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) { + dma->status =MUSB_DMA_STATUS_CORE_ABORT ; (void ) musb->dma_controller->channel_abort (dma); xfer_len = dma->actual_len; }
@@ -1470,7 +1470,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) goto finish; } -if (unlikely (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY )) { +if (unlikely (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY )) {/* SHOULD NEVER HAPPEN ... but at least DaVinci has done it */ ERR ("RX%d dma busy, csr %04x\n" , epnum, rx_csr); goto finish;
@@ -1490,8 +1490,8 @@ void musb_host_rx(struct musb *musb, u8 epnum)* and also duplicates dma cleanup code above ... plus, * shouldn't this be the "half full" double buffer case? */ -if (dma_channel_status (dma) ==MGC_DMA_STATUS_BUSY ) { - dma->status =MGC_DMA_STATUS_CORE_ABORT ; +if (dma_channel_status (dma) ==MUSB_DMA_STATUS_BUSY ) { + dma->status =MUSB_DMA_STATUS_CORE_ABORT ; (void ) musb->dma_controller->channel_abort (dma); xfer_len = dma->actual_len; done = TRUE;
drivers/usb/musb/musbhsdma.c +9 -9
@@ -144,7 +144,7 @@ static struct dma_channel* dma_channel_allocate(struct dma_controller *c, pImplChannel->transmit = transmit; pChannel = &(pImplChannel->Channel); pChannel->private_data = pImplChannel; - pChannel->status =MGC_DMA_STATUS_FREE ; + pChannel->status =MUSB_DMA_STATUS_FREE ; pChannel->max_len =0x10000 ;/* Tx => mode 1; Rx => mode 0 */ pChannel->desired_mode = transmit;
@@ -167,7 +167,7 @@ static void dma_channel_release(struct dma_channel *pChannel) pImplChannel->controller->bmUsedChannels &= ~(1 << pImplChannel->bIndex); - pChannel->status =MGC_DMA_STATUS_UNKNOWN ; + pChannel->status =MUSB_DMA_STATUS_UNKNOWN ; } static void configure_channel(struct dma_channel *pChannel,
@@ -232,14 +232,14 @@ static int dma_channel_program(struct dma_channel * pChannel, pImplChannel->transmit ?"Tx" :"Rx" , packet_sz, dma_addr, len, mode); -BUG_ON (pChannel->status ==MGC_DMA_STATUS_UNKNOWN || - pChannel->status ==MGC_DMA_STATUS_BUSY ); +BUG_ON (pChannel->status ==MUSB_DMA_STATUS_UNKNOWN || + pChannel->status ==MUSB_DMA_STATUS_BUSY ); pChannel->actual_len =0 ; pImplChannel->dwStartAddress = dma_addr; pImplChannel->len = len; pImplChannel->wMaxPacketSize = packet_sz; - pChannel->status =MGC_DMA_STATUS_BUSY ; + pChannel->status =MUSB_DMA_STATUS_BUSY ;if ((mode ==1 ) && (len >= packet_sz)) { configure_channel(pChannel, packet_sz, 1, dma_addr,
@@ -259,7 +259,7 @@ static int dma_channel_abort(struct dma_channel *pChannel)u8 *mbase = pImplChannel->controller->pCoreBase;u16 csr; -if (pChannel->status ==MGC_DMA_STATUS_BUSY ) { +if (pChannel->status ==MUSB_DMA_STATUS_BUSY ) {if (pImplChannel->transmit) { csr = musb_readw(mbase,
@@ -289,7 +289,7 @@ static int dma_channel_abort(struct dma_channel *pChannel)musb_writel (mbase,MGC_HSDMA_CHANNEL_OFFSET (bChannel,MGC_O_HSDMA_COUNT ),0 ); - pChannel->status =MGC_DMA_STATUS_FREE ; + pChannel->status =MUSB_DMA_STATUS_FREE ; }return 0 ; }
@@ -323,7 +323,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)if (csr & (1 <<MUSB_HSDMA_BUSERROR_SHIFT )) { pImplChannel->Channel.status = -MGC_DMA_STATUS_BUS_ABORT ; +MUSB_DMA_STATUS_BUS_ABORT ; }else { dwAddress = musb_readl(mbase, MGC_HSDMA_CHANNEL_OFFSET(
@@ -343,7 +343,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)u8 devctl =musb_readb (mbase,MUSB_DEVCTL ); - pChannel->status =MGC_DMA_STATUS_FREE ; + pChannel->status =MUSB_DMA_STATUS_FREE ;/* completed */ if ((devctl & MUSB_DEVCTL_HM)
drivers/usb/musb/tusb6010_omap.c +8 -8
@@ -202,7 +202,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data)if (!dmareq_works ())tusb_omap_free_shared_dmareq (chdat); - channel->status =MGC_DMA_STATUS_FREE ; + channel->status =MUSB_DMA_STATUS_FREE ;/* Handle only RX callbacks here. TX callbacks musb be handled based * on the TUSB DMA status interrupt.
@@ -296,7 +296,7 @@ static int tusb_omap_dma_program(struct dma_channel *channel, u16 packet_sz, chdat->len = len; channel->actual_len =0 ; chdat->dma_addr = (void __iomem *)dma_addr; - channel->status =MGC_DMA_STATUS_BUSY ; + channel->status =MUSB_DMA_STATUS_BUSY ;/* Since we're recycling dma areas, we need to clean or invalidate */ if (chdat->tx) {
@@ -430,7 +430,7 @@ static int tusb_omap_dma_abort(struct dma_channel *channel) tusb_dma->sync_dev =-1 ; } - channel->status =MGC_DMA_STATUS_FREE ; + channel->status =MUSB_DMA_STATUS_FREE ;return 0 ; }
@@ -521,8 +521,8 @@ tusb_omap_dma_allocate(struct dma_controller *c,for (i =0 ; i <MAX_DMAREQ ; i++) {struct dma_channel *ch = dma_channel_pool[i]; -if (ch->status ==MGC_DMA_STATUS_UNKNOWN ) { - ch->status =MGC_DMA_STATUS_FREE ; +if (ch->status ==MUSB_DMA_STATUS_UNKNOWN ) { + ch->status =MUSB_DMA_STATUS_FREE ; channel = ch; chdat = ch->private_data;break ;
@@ -589,7 +589,7 @@ free_dmareq:tusb_omap_dma_free_dmareq (chdat);DBG (3 ,"ep%i: Could not get a DMA channel\n" , chdat->epnum); - channel->status =MGC_DMA_STATUS_UNKNOWN ; + channel->status =MUSB_DMA_STATUS_UNKNOWN ;return NULL ; }
@@ -617,7 +617,7 @@ static void tusb_omap_dma_release(struct dma_channel *channel) reg |= (1 << (chdat->epnum +15 ));musb_writel (tusb_base,TUSB_DMA_INT_CLEAR , reg); - channel->status =MGC_DMA_STATUS_UNKNOWN ; + channel->status =MUSB_DMA_STATUS_UNKNOWN ;if (chdat->ch >=0 ) {omap_stop_dma (chdat->ch);
@@ -702,7 +702,7 @@ dma_controller_create(struct musb *musb, void __iomem *base)if (!chdat) goto cleanup; - ch->status =MGC_DMA_STATUS_UNKNOWN ; + ch->status =MUSB_DMA_STATUS_UNKNOWN ; ch->private_data = chdat; }
Signature · 1 line
1.5.2.3
Re: [PATCH 8/36] musb_hdrc: Search and replace pUrb with urb
In reply to Tony LindgrenQuoted 1 line · Tony Lindgren
Search and replace pUrb with urb
"Hungarian Notation" makes sense in assembly language, but not higher level languages.
Glad I am, to see more of this stuff vanish! :)
Re: [PATCH 8/36] musb_hdrc: Search and replace pUrb with urb
Quoted 7 lines · David Brownell
Quoted 1 line · Tony Lindgren
Search and replace pUrb with urb
"Hungarian Notation" makes sense in assembly language, but not higher level languages.
Glad I am, to see more of this stuff vanish! :)
OK, will push this series today.
Tony
Hi Tony,
Quoted 11 lines · Tony Lindgren
Hi all,
Here's still some more musb driver clean-up, including the license update to make it generic instead of Mentor specific.
Again, I haven't touched
cppi_dmaor musbhsdma code much except for common variable names. These files still suffer from badCamelCasingSymptoms.Tested on tusb.
Acking your series...
Tested here on tusb also.
Quoted 10 lines
Regards,
Tony
_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source
Signature · 4 lines
Best Regards, Felipe Balbi [email protected]