Commit 56c82cdc authored by Matthew Leach's avatar Matthew Leach Committed by Linus Torvalds

musb: tusb6010: use io{read,write}*_rep accessors

The {read,write}s{b,w,l} operations are not defined by all architectures
and are being removed from the asm-generic/io.h interface.

This patch replaces the usage of these string functions in the tusb6010
accessors with io{read,write}{8,16,32}_rep calls instead.
Signed-off-by: default avatarMatthew Leach <matthew@mattleach.net>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 41739ee3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/usb/nop-usb-xceiv.h> #include <linux/usb/nop-usb-xceiv.h>
...@@ -198,7 +199,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf) ...@@ -198,7 +199,7 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf)
/* Best case is 32bit-aligned destination address */ /* Best case is 32bit-aligned destination address */
if ((0x02 & (unsigned long) buf) == 0) { if ((0x02 & (unsigned long) buf) == 0) {
if (len >= 4) { if (len >= 4) {
writesl(fifo, buf, len >> 2); iowrite32_rep(fifo, buf, len >> 2);
buf += (len & ~0x03); buf += (len & ~0x03);
len &= 0x03; len &= 0x03;
} }
...@@ -245,7 +246,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf) ...@@ -245,7 +246,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf)
/* Best case is 32bit-aligned destination address */ /* Best case is 32bit-aligned destination address */
if ((0x02 & (unsigned long) buf) == 0) { if ((0x02 & (unsigned long) buf) == 0) {
if (len >= 4) { if (len >= 4) {
readsl(fifo, buf, len >> 2); ioread32_rep(fifo, buf, len >> 2);
buf += (len & ~0x03); buf += (len & ~0x03);
len &= 0x03; len &= 0x03;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment