On Fri, Apr 11, 2008 at 11:28:28AM +0300, Felipe Balbi wrote:
> Misc cleanup patch.
>
> Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
> ---
> drivers/usb/musb/musbhsdma.c | 17 ++++++++---------
> 1 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
> index 97fd146..f0ac65d 100644
> --- a/drivers/usb/musb/musbhsdma.c
> +++ b/drivers/usb/musb/musbhsdma.c
> @@ -216,7 +216,7 @@ static void configure_channel(struct dma_channel *pChannel,
> csr);
> }
>
> -static int dma_channel_program(struct dma_channel * pChannel,
> +static int dma_channel_program(struct dma_channel *pChannel,
> u16 packet_sz, u8 mode,
> dma_addr_t dma_addr, u32 len)
> {
> @@ -257,22 +257,21 @@ static int dma_channel_abort(struct dma_channel *pChannel)
> if (pImplChannel->transmit) {
>
> csr = musb_readw(mbase,
> - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR));
> + MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR));
> csr &= ~(MUSB_TXCSR_AUTOSET |
> MUSB_TXCSR_DMAENAB |
> MUSB_TXCSR_DMAMODE);
> musb_writew(mbase,
> - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR),
> + MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
> csr);
> - }
> - else {
> + } else {
> csr = musb_readw(mbase,
> - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR));
> + MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR));
> csr &= ~(MUSB_RXCSR_AUTOCLEAR |
> MUSB_RXCSR_DMAENAB |
> MUSB_RXCSR_DMAMODE);
> musb_writew(mbase,
> - MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR),
> + MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR),
> csr);
> }
>
> @@ -402,8 +401,8 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
> return NULL;
> }
>
> - if (!(controller = kzalloc(sizeof(struct musb_dma_controller),
> - GFP_KERNEL)))
> + controller = kzalloc(sizeof(struct musb_dma_controller), GPF_KERNEL);
Ugh, typo here... resending patch
> + if (!controller)
> return NULL;
>
> controller->bChannelCount = MUSB_HSDMA_CHANNELS;
> --
> 1.5.5.23.g2a5fe
--
- Balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
