From: Will Deacon <will.deacon@arm.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, benh@kernel.crashing.org,
arnd@arndb.de, james.hogan@imgtec.com,
Matthew Leach <matthew@mattleach.net>,
Felipe Balbi <balbi@ti.com>,
linux-usb@vger.kernel.org, Will Deacon <will.deacon@arm.com>
Subject: [PATCH v2 08/10] musb: tusb6010: use io{read,write}*_rep accessors
Date: Mon, 10 Dec 2012 19:12:40 +0000 [thread overview]
Message-ID: <1355166762-15133-9-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1355166762-15133-1-git-send-email-will.deacon@arm.com>
From: Matthew Leach <matthew@mattleach.net>
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.
Cc: Felipe Balbi <balbi@ti.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Matthew Leach <matthew@mattleach.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
drivers/usb/musb/tusb6010.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index dc4d75e..0cc2f50 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -22,6 +22,7 @@
#include <linux/prefetch.h>
#include <linux/usb.h>
#include <linux/irq.h>
+#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.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)
/* Best case is 32bit-aligned destination address */
if ((0x02 & (unsigned long) buf) == 0) {
if (len >= 4) {
- writesl(fifo, buf, len >> 2);
+ iowrite32_rep(fifo, buf, len >> 2);
buf += (len & ~0x03);
len &= 0x03;
}
@@ -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 */
if ((0x02 & (unsigned long) buf) == 0) {
if (len >= 4) {
- readsl(fifo, buf, len >> 2);
+ ioread32_rep(fifo, buf, len >> 2);
buf += (len & ~0x03);
len &= 0x03;
}
--
1.8.0
next prev parent reply other threads:[~2012-12-10 19:12 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 19:12 [PATCH v2 00/10] Fix endianness of generic I/O accessors Will Deacon
2012-12-10 19:12 ` [PATCH v2 01/10] asm-generic: io: don't perform swab during {in,out} string functions Will Deacon
2012-12-10 19:12 ` [PATCH v2 02/10] mmc: mmci: use io{read,write}*_rep accessors instead of " Will Deacon
2012-12-10 19:12 ` [PATCH v2 03/10] net: smc91x: " Will Deacon
2012-12-10 20:47 ` David Miller
2012-12-10 19:12 ` [PATCH v2 04/10] net: smc911x: use io{read,write}*_rep accessors Will Deacon
2012-12-10 20:47 ` David Miller
2012-12-11 14:49 ` Will Deacon
2012-12-11 17:51 ` David Miller
2012-12-10 19:12 ` [PATCH v2 05/10] net: dm9000: " Will Deacon
2012-12-10 20:47 ` David Miller
2012-12-10 19:12 ` [PATCH v2 06/10] net: 8390: " Will Deacon
2012-12-10 20:47 ` David Miller
2012-12-10 19:12 ` [PATCH v2 07/10] mtd: nand/gpio: " Will Deacon
2012-12-13 11:28 ` Artem Bityutskiy
2012-12-10 19:12 ` Will Deacon [this message]
2012-12-10 19:12 ` [PATCH v2 09/10] usb: musb: " Will Deacon
2012-12-10 19:12 ` [PATCH v2 10/10] asm-generic: io: remove {read,write} string functions Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355166762-15133-9-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=benh@kernel.crashing.org \
--cc=james.hogan@imgtec.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthew@mattleach.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®