aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorBryan Wu <cooloney@kernel.org>2008-12-02 21:33:51 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 10:00:08 -0800
commite22b582e9108b94a8bb59010da3e09709bd39746 (patch)
tree0f11d82ef80ea17f095f2f950cf43b22f5c56500 /drivers/usb
parent7833414d4f39009d4d04e96648a099630adf3f62 (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')
-rw-r--r--drivers/usb/musb/blackfin.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index eed35c933bc..78613485209 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)
dump_fifo_data(src, len);
if (unlikely((unsigned long)src & 0x01))
- outsw_8(fifo, src, len & 0x01 ? (len >> 1) + 1 : len >> 1);
+ outsw_8((unsigned long)fifo, src,
+ len & 0x01 ? (len >> 1) + 1 : len >> 1);
else
- outsw(fifo, src, len & 0x01 ? (len >> 1) + 1 : len >> 1);
+ outsw((unsigned long)fifo, src,
+ len & 0x01 ? (len >> 1) + 1 : len >> 1);
}
/*
@@ -54,8 +56,6 @@ 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;
- int i;
- u16 *data;
DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
'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)
SSYNC();
#else
if (unlikely((unsigned long)dst & 0x01))
- insw_8(fifo, dst, len & 0x01 ? (len >> 1) + 1 : len >> 1);
+ insw_8((unsigned long)fifo, dst,
+ len & 0x01 ? (len >> 1) + 1 : len >> 1);
else
- insw(fifo, dst, len & 0x01 ? (len >> 1) + 1 : len >> 1);
+ insw((unsigned long)fifo, dst,
+ len & 0x01 ? (len >> 1) + 1 : len >> 1);
#endif
dump_fifo_data(dst, len);