Skip to content

Commit

Permalink
USB: musb: Kill some compiling warning in musb Blackfin part
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bryan Wu authored and Greg Kroah-Hartman committed Jan 7, 2009
1 parent 7833414 commit e22b582
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/usb/musb/blackfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit e22b582

Please sign in to comment.