diff options
author | Matthew Leach <matthew@mattleach.net> | 2012-12-17 18:59:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:13 -0500 |
commit | 56c82cdc36a836f564cf4ea09da16fd9297ab3b5 (patch) | |
tree | 3649f5cd113c53bf0eaeb4e44e9218c555a9b777 /drivers/usb | |
parent | 41739ee355abc39d36bde6feed32ad16c63ceea2 (diff) |
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: Matthew Leach <matthew@mattleach.net>
Signed-off-by: Will 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/musb/tusb6010.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c index 8bde6fc5eb75..3969813c217d 100644 --- a/drivers/usb/musb/tusb6010.c +++ b/drivers/usb/musb/tusb6010.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/prefetch.h> | 22 | #include <linux/prefetch.h> |
23 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
25 | #include <linux/io.h> | ||
25 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
26 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
27 | #include <linux/usb/nop-usb-xceiv.h> | 28 | #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 | /* Best case is 32bit-aligned destination address */ | 199 | /* Best case is 32bit-aligned destination address */ |
199 | if ((0x02 & (unsigned long) buf) == 0) { | 200 | if ((0x02 & (unsigned long) buf) == 0) { |
200 | if (len >= 4) { | 201 | if (len >= 4) { |
201 | writesl(fifo, buf, len >> 2); | 202 | iowrite32_rep(fifo, buf, len >> 2); |
202 | buf += (len & ~0x03); | 203 | buf += (len & ~0x03); |
203 | len &= 0x03; | 204 | len &= 0x03; |
204 | } | 205 | } |
@@ -245,7 +246,7 @@ void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *buf) | |||
245 | /* Best case is 32bit-aligned destination address */ | 246 | /* Best case is 32bit-aligned destination address */ |
246 | if ((0x02 & (unsigned long) buf) == 0) { | 247 | if ((0x02 & (unsigned long) buf) == 0) { |
247 | if (len >= 4) { | 248 | if (len >= 4) { |
248 | readsl(fifo, buf, len >> 2); | 249 | ioread32_rep(fifo, buf, len >> 2); |
249 | buf += (len & ~0x03); | 250 | buf += (len & ~0x03); |
250 | len &= 0x03; | 251 | len &= 0x03; |
251 | } | 252 | } |