Commit 6bfe305e authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren

USB: MUSB: checkpatch.pl fixes to musbhsdma.c

Misc cleanup patch.
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 261a2f59
...@@ -216,7 +216,7 @@ static void configure_channel(struct dma_channel *pChannel, ...@@ -216,7 +216,7 @@ static void configure_channel(struct dma_channel *pChannel,
csr); csr);
} }
static int dma_channel_program(struct dma_channel * pChannel, static int dma_channel_program(struct dma_channel *pChannel,
u16 packet_sz, u8 mode, u16 packet_sz, u8 mode,
dma_addr_t dma_addr, u32 len) dma_addr_t dma_addr, u32 len)
{ {
...@@ -257,22 +257,21 @@ static int dma_channel_abort(struct dma_channel *pChannel) ...@@ -257,22 +257,21 @@ static int dma_channel_abort(struct dma_channel *pChannel)
if (pImplChannel->transmit) { if (pImplChannel->transmit) {
csr = musb_readw(mbase, csr = musb_readw(mbase,
MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR)); MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR));
csr &= ~(MUSB_TXCSR_AUTOSET | csr &= ~(MUSB_TXCSR_AUTOSET |
MUSB_TXCSR_DMAENAB | MUSB_TXCSR_DMAENAB |
MUSB_TXCSR_DMAMODE); MUSB_TXCSR_DMAMODE);
musb_writew(mbase, musb_writew(mbase,
MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_TXCSR), MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
csr); csr);
} } else {
else {
csr = musb_readw(mbase, csr = musb_readw(mbase,
MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR)); MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR));
csr &= ~(MUSB_RXCSR_AUTOCLEAR | csr &= ~(MUSB_RXCSR_AUTOCLEAR |
MUSB_RXCSR_DMAENAB | MUSB_RXCSR_DMAENAB |
MUSB_RXCSR_DMAMODE); MUSB_RXCSR_DMAMODE);
musb_writew(mbase, musb_writew(mbase,
MUSB_EP_OFFSET(pImplChannel->epnum,MUSB_RXCSR), MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR),
csr); csr);
} }
...@@ -402,8 +401,8 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase) ...@@ -402,8 +401,8 @@ dma_controller_create(struct musb *musb, void __iomem *pCoreBase)
return NULL; return NULL;
} }
if (!(controller = kzalloc(sizeof(struct musb_dma_controller), controller = kzalloc(sizeof(struct musb_dma_controller), GFP_KERNEL);
GFP_KERNEL))) if (!controller)
return NULL; return NULL;
controller->bChannelCount = MUSB_HSDMA_CHANNELS; controller->bChannelCount = MUSB_HSDMA_CHANNELS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment