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

[linux-2.6-omap-h63xx.git] / drivers / usb / musb / musbhsdma.c

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 97fd14659d8b07ccf6ff43458eee6eb7e506e14c..75f084f0341c49a08180d2951d169a9c541f10c5 100644 (file)
--- 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), GFP_KERNEL);
+       if (!controller)
                return NULL;
 
        controller->bChannelCount = MUSB_HSDMA_CHANNELS;