aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-12-10 04:12:35 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-10 15:43:58 -0500
commit4ba73aa1c9223f8f0dd5bb358dfea70309672d99 (patch)
treed435aa234378bf0ec9c9be17b594a80e33c7f134 /drivers/net
parent6e73d71d8485607c692302d2058894588e3a387f (diff)
net: smc91x: use io{read, write}*_rep accessors instead of string functions
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/smsc/smc91x.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index 5f53fbbf67be..370e13dde115 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)
286 286
287#define SMC_IO_SHIFT (lp->io_shift) 287#define SMC_IO_SHIFT (lp->io_shift)
288 288
289#define SMC_inb(a, r) readb((a) + (r)) 289#define SMC_inb(a, r) ioread8((a) + (r))
290#define SMC_inw(a, r) readw((a) + (r)) 290#define SMC_inw(a, r) ioread16((a) + (r))
291#define SMC_inl(a, r) readl((a) + (r)) 291#define SMC_inl(a, r) ioread32((a) + (r))
292#define SMC_outb(v, a, r) writeb(v, (a) + (r)) 292#define SMC_outb(v, a, r) iowrite8(v, (a) + (r))
293#define SMC_outw(v, a, r) writew(v, (a) + (r)) 293#define SMC_outw(v, a, r) iowrite16(v, (a) + (r))
294#define SMC_outl(v, a, r) writel(v, (a) + (r)) 294#define SMC_outl(v, a, r) iowrite32(v, (a) + (r))
295#define SMC_insw(a, r, p, l) readsw((a) + (r), p, l) 295#define SMC_insw(a, r, p, l) ioread16_rep((a) + (r), p, l)
296#define SMC_outsw(a, r, p, l) writesw((a) + (r), p, l) 296#define SMC_outsw(a, r, p, l) iowrite16_rep((a) + (r), p, l)
297#define SMC_insl(a, r, p, l) readsl((a) + (r), p, l) 297#define SMC_insl(a, r, p, l) ioread32_rep((a) + (r), p, l)
298#define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) 298#define SMC_outsl(a, r, p, l) iowrite32_rep((a) + (r), p, l)
299 299
300#define RPC_LSA_DEFAULT RPC_LED_100_10 300#define RPC_LSA_DEFAULT RPC_LED_100_10
301#define RPC_LSB_DEFAULT RPC_LED_TX_RX 301#define RPC_LSB_DEFAULT RPC_LED_TX_RX