diff options
author | Bryan Wu <cooloney@kernel.org> | 2008-12-02 14:33:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-07 13:00:08 -0500 |
commit | e22b582e9108b94a8bb59010da3e09709bd39746 (patch) | |
tree | 0f11d82ef80ea17f095f2f950cf43b22f5c56500 /drivers/usb/musb | |
parent | 7833414d4f39009d4d04e96648a099630adf3f62 (diff) |
USB: musb: Kill some compiling warning in musb Blackfin part
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r-- | drivers/usb/musb/blackfin.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c index eed35c933bc2..786134852092 100644 --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c | |||
@@ -41,9 +41,11 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src) | |||
41 | dump_fifo_data(src, len); | 41 | dump_fifo_data(src, len); |
42 | 42 | ||
43 | if (unlikely((unsigned long)src & 0x01)) | 43 | if (unlikely((unsigned long)src & 0x01)) |
44 | outsw_8(fifo, src, len & 0x01 ? (len >> 1) + 1 : len >> 1); | 44 | outsw_8((unsigned long)fifo, src, |
45 | len & 0x01 ? (len >> 1) + 1 : len >> 1); | ||
45 | else | 46 | else |
46 | outsw(fifo, src, len & 0x01 ? (len >> 1) + 1 : len >> 1); | 47 | outsw((unsigned long)fifo, src, |
48 | len & 0x01 ? (len >> 1) + 1 : len >> 1); | ||
47 | } | 49 | } |
48 | 50 | ||
49 | /* | 51 | /* |
@@ -54,8 +56,6 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) | |||
54 | void __iomem *fifo = hw_ep->fifo; | 56 | void __iomem *fifo = hw_ep->fifo; |
55 | u8 epnum = hw_ep->epnum; | 57 | u8 epnum = hw_ep->epnum; |
56 | u16 dma_reg = 0; | 58 | u16 dma_reg = 0; |
57 | int i; | ||
58 | u16 *data; | ||
59 | 59 | ||
60 | DBG(4, "%cX ep%d fifo %p count %d buf %p\n", | 60 | DBG(4, "%cX ep%d fifo %p count %d buf %p\n", |
61 | 'R', hw_ep->epnum, fifo, len, dst); | 61 | 'R', hw_ep->epnum, fifo, len, dst); |
@@ -96,9 +96,11 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst) | |||
96 | SSYNC(); | 96 | SSYNC(); |
97 | #else | 97 | #else |
98 | if (unlikely((unsigned long)dst & 0x01)) | 98 | if (unlikely((unsigned long)dst & 0x01)) |
99 | insw_8(fifo, dst, len & 0x01 ? (len >> 1) + 1 : len >> 1); | 99 | insw_8((unsigned long)fifo, dst, |
100 | len & 0x01 ? (len >> 1) + 1 : len >> 1); | ||
100 | else | 101 | else |
101 | insw(fifo, dst, len & 0x01 ? (len >> 1) + 1 : len >> 1); | 102 | insw((unsigned long)fifo, dst, |
103 | len & 0x01 ? (len >> 1) + 1 : len >> 1); | ||
102 | #endif | 104 | #endif |
103 | 105 | ||
104 | dump_fifo_data(dst, len); | 106 | dump_fifo_data(dst, len); |