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,
Will Deacon <will.deacon@arm.com>,
Nicolas Pitre <nico@fluxnic.net>,
netdev@vger.kernel.org
Subject: [PATCH v2 03/10] net: smc91x: use io{read,write}*_rep accessors instead of string functions
Date: Mon, 10 Dec 2012 19:12:35 +0000 [thread overview]
Message-ID: <1355166762-15133-4-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1355166762-15133-1-git-send-email-will.deacon@arm.com>
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 default
SMC accessors with io{read,write}{8,16,32}_rep calls instead, which are
defined for all architectures.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
drivers/net/ethernet/smsc/smc91x.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 5f53fbb..370e13d 100644
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -286,16 +286,16 @@ static inline void mcf_outsw(void *a, unsigned char *p, int l)
#define SMC_IO_SHIFT (lp->io_shift)
-#define SMC_inb(a, r) readb((a) + (r))
-#define SMC_inw(a, r) readw((a) + (r))
-#define SMC_inl(a, r) readl((a) + (r))
-#define SMC_outb(v, a, r) writeb(v, (a) + (r))
-#define SMC_outw(v, a, r) writew(v, (a) + (r))
-#define SMC_outl(v, a, r) writel(v, (a) + (r))
-#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l)
-#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l)
-#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l)
-#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l)
+#define SMC_inb(a, r) ioread8((a) + (r))
+#define SMC_inw(a, r) ioread16((a) + (r))
+#define SMC_inl(a, r) ioread32((a) + (r))
+#define SMC_outb(v, a, r) iowrite8(v, (a) + (r))
+#define SMC_outw(v, a, r) iowrite16(v, (a) + (r))
+#define SMC_outl(v, a, r) iowrite32(v, (a) + (r))
+#define SMC_insw(a, r, p, l) ioread16_rep((a) + (r), p, l)
+#define SMC_outsw(a, r, p, l) iowrite16_rep((a) + (r), p, l)
+#define SMC_insl(a, r, p, l) ioread32_rep((a) + (r), p, l)
+#define SMC_outsl(a, r, p, l) iowrite32_rep((a) + (r), p, l)
#define RPC_LSA_DEFAULT RPC_LED_100_10
#define RPC_LSB_DEFAULT RPC_LED_TX_RX
--
1.8.0
next prev parent reply other threads:[~2012-12-10 19:12 UTC|newest]
Thread overview: 31+ 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 ` 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 ` Will Deacon
2012-12-10 19:12 ` Will Deacon [this message]
2012-12-10 19:12 ` [PATCH v2 03/10] net: smc91x: " Will Deacon
2012-12-10 20:47 ` David Miller
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 19:12 ` 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 19:12 ` Will Deacon
2012-12-10 20:47 ` David Miller
2012-12-10 20:47 ` David Miller
2012-12-10 19:12 ` [PATCH v2 06/10] net: 8390: " Will Deacon
2012-12-10 19:12 ` 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-10 19:12 ` Will Deacon
2012-12-13 11:28 ` Artem Bityutskiy
2012-12-13 11:28 ` Artem Bityutskiy
2012-12-10 19:12 ` [PATCH v2 08/10] musb: tusb6010: " Will Deacon
2012-12-10 19:12 ` Will Deacon
2012-12-10 19:12 ` [PATCH v2 09/10] usb: musb: " Will Deacon
2012-12-10 19:12 ` Will Deacon
2012-12-10 19:12 ` [PATCH v2 10/10] asm-generic: io: remove {read,write} string functions Will Deacon
2012-12-10 19:12 ` 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-4-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=james.hogan@imgtec.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.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;
as well as URLs for NNTP newsgroup(s).