From: Tony Lindgren Date: Mon, 13 Aug 2007 11:52:38 +0000 (-0700) Subject: musb_hdrc: Search and replace dwMaxLength with max_len X-Git-Tag: v2.6.23-omap1~228^2~14 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1b5ff8d8886feccb1fbe4d31c424bed9d9fa4890;p=linux-2.6-omap-h63xx.git musb_hdrc: Search and replace dwMaxLength with max_len Search and replace dwMaxLength with max_len Signed-off-by: Tony Lindgren --- diff --git a/drivers/usb/musb/dma.h b/drivers/usb/musb/dma.h index 2b7ed74118a..469c0947bc8 100644 --- a/drivers/usb/musb/dma.h +++ b/drivers/usb/musb/dma.h @@ -113,7 +113,7 @@ struct dma_controller; struct dma_channel { void *private_data; // FIXME not void* private_data, but a dma_controller * - size_t dwMaxLength; + size_t max_len; size_t dwActualLength; enum dma_channel_status bStatus; u8 bDesiredMode; @@ -129,7 +129,7 @@ struct dma_channel { * @bMode: 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 dwMaxLength + * reported max_len * * Returns TRUE on success, else FALSE */ diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index dda15f87da5..c8270b10b83 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -304,7 +304,7 @@ static void txstate(struct musb *musb, struct musb_request *req) /* setup DMA, then program endpoint CSR */ request_size = min(pRequest->length, - musb_ep->dma->dwMaxLength); + musb_ep->dma->max_len); if (request_size <= musb_ep->wPacketSize) musb_ep->dma->bDesiredMode = 0; else @@ -661,7 +661,7 @@ static void rxstate(struct musb *musb, struct musb_request *req) int transfer_size = 0; #ifdef USE_MODE1 transfer_size = min(pRequest->length, - channel->dwMaxLength); + channel->max_len); #else transfer_size = len; #endif diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index e5b73248f97..3190cc24f06 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -771,7 +771,7 @@ static void musb_ep_program(struct musb *musb, u8 epnum, musb_writew(epio, MGC_O_HDRC_TXCSR, wCsr | MGC_M_TXCSR_MODE); - qh->segsize = min(dwLength, pDmaChannel->dwMaxLength); + qh->segsize = min(dwLength, pDmaChannel->max_len); if (qh->segsize <= wPacketSize) pDmaChannel->bDesiredMode = 0; diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 28a9aeef1ee..272e856ee4a 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -145,7 +145,7 @@ static struct dma_channel* dma_channel_allocate(struct dma_controller *c, pChannel = &(pImplChannel->Channel); pChannel->private_data = pImplChannel; pChannel->bStatus = MGC_DMA_STATUS_FREE; - pChannel->dwMaxLength = 0x10000; + pChannel->max_len = 0x10000; /* Tx => mode 1; Rx => mode 0 */ pChannel->bDesiredMode = bTransmit; pChannel->dwActualLength = 0; diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 299c3c8dc9e..7a3fc8ac42a 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -548,7 +548,7 @@ tusb_omap_dma_allocate(struct dma_controller *c, chdat->completed_len = 0; chdat->tusb_dma = tusb_dma; - channel->dwMaxLength = 0x7fffffff; + channel->max_len = 0x7fffffff; channel->bDesiredMode = 0; channel->dwActualLength = 0;