include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / usb / musb / blackfin.c

diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index ad26e65..719a22d 100644 (file)
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/gpio.h>
@@ -30,7 +29,6 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
        void __iomem *fifo = hw_ep->fifo;
        void __iomem *epio = hw_ep->regs;
        u8 epnum = hw_ep->epnum;
-       u16 dma_reg = 0;
 
        prefetch((u8 *)src);
 
@@ -42,15 +40,17 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
        dump_fifo_data(src, len);
 
        if (!ANOMALY_05000380 && epnum != 0) {
-               flush_dcache_range((unsigned int)src,
-                       (unsigned int)(src + len));
+               u16 dma_reg;
+
+               flush_dcache_range((unsigned long)src,
+                       (unsigned long)(src + len));
 
                /* Setup DMA address register */
-               dma_reg = (u16) ((u32) src & 0xFFFF);
+               dma_reg = (u32)src;
                bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_LOW), dma_reg);
                SSYNC();
 
-               dma_reg = (u16) (((u32) src >> 16) & 0xFFFF);
+               dma_reg = (u32)src >> 16;
                bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_HIGH), dma_reg);
                SSYNC();
 
@@ -79,12 +79,9 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
                SSYNC();
 
                if (unlikely((unsigned long)src & 0x01))
-                       outsw_8((unsigned long)fifo, src,
-                               len & 0x01 ? (len >> 1) + 1 : len >> 1);
+                       outsw_8((unsigned long)fifo, src, (len + 1) >> 1);
                else
-                       outsw((unsigned long)fifo, src,
-                               len & 0x01 ? (len >> 1) + 1 : len >> 1);
-
+                       outsw((unsigned long)fifo, src, (len + 1) >> 1);
        }
 }
 /*
@@ -94,19 +91,19 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
 {
        void __iomem *fifo = hw_ep->fifo;
        u8 epnum = hw_ep->epnum;
-       u16 dma_reg = 0;
 
        if (ANOMALY_05000467 && epnum != 0) {
+               u16 dma_reg;
 
-               invalidate_dcache_range((unsigned int)dst,
-                       (unsigned int)(dst + len));
+               invalidate_dcache_range((unsigned long)dst,
+                       (unsigned long)(dst + len));
 
                /* Setup DMA address register */
-               dma_reg = (u16) ((u32) dst & 0xFFFF);
+               dma_reg = (u32)dst;
                bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_LOW), dma_reg);
                SSYNC();
 
-               dma_reg = (u16) (((u32) dst >> 16) & 0xFFFF);
+               dma_reg = (u32)dst >> 16;
                bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_HIGH), dma_reg);
                SSYNC();