All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will.deacon@arm.com>
To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de>,
	Ben Herrenschmidt <benh@kernel.crashing.org>
Subject: [RESEND PATCH 4/4] net: smc91x: use io{read,write}*_rep accessors instead of string functions
Date: Wed, 17 Oct 2012 16:45:04 +0100	[thread overview]
Message-ID: <1350488704-3711-5-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1350488704-3711-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>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 drivers/net/ethernet/smsc/smc91x.h |   20 ++++++++++----------
 1 files 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.7.4.1

  parent reply	other threads:[~2012-10-17 15:45 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-17 15:45 [RESEND PATCH 0/4] Fix endianness of generic I/O accessors Will Deacon
2012-10-17 15:45 ` [RESEND PATCH 1/4] asm-generic: io: remove {read,write} string functions Will Deacon
2012-10-26 13:29   ` Arnd Bergmann
2012-10-26 13:38     ` Will Deacon
2012-10-17 15:45 ` [RESEND PATCH 2/4] asm-generic: io: don't perform swab during {in,out} " Will Deacon
2012-10-17 19:16   ` Geert Uytterhoeven
2012-10-18  0:04     ` Benjamin Herrenschmidt
2012-10-18  5:48       ` Geert Uytterhoeven
2012-10-19 12:53         ` Will Deacon
2012-10-23  1:25         ` Benjamin Herrenschmidt
2012-10-28  9:28           ` Geert Uytterhoeven
2012-10-28 20:38             ` Benjamin Herrenschmidt
2012-10-18  0:01   ` Benjamin Herrenschmidt
2012-10-17 15:45 ` [RESEND PATCH 3/4] mmc: mmci: use io{read,write}*_rep accessors instead of " Will Deacon
2012-10-17 15:45 ` Will Deacon [this message]
2012-10-19  8:25   ` [RESEND PATCH 4/4] net: smc91x: " James Hogan
2012-10-19  8:25     ` James Hogan
2012-10-19  9:27     ` 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=1350488704-3711-5-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.com \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.