net: 8390: 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 8390
accessors with io{read,write}{8,16,32}_rep calls instead.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Matthew Leach <matthew@mattleach.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index 203ff9dccadb03206a20f96ea1e71437a98be3be..0338352bc0369cc4d7f1836ec2395b6bf2383e28 100644 (file)
--- a/drivers/net/ethernet/8390/ax88796.c
+++ b/drivers/net/ethernet/8390/ax88796.c
@@ -191,11 +191,11 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
        ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
 
        if (ei_local->word16)
-               readsw(nic_base + NE_DATAPORT, hdr,
-                      sizeof(struct e8390_pkt_hdr) >> 1);
+               ioread16_rep(nic_base + NE_DATAPORT, hdr,
+                            sizeof(struct e8390_pkt_hdr) >> 1);
        else
-               readsb(nic_base + NE_DATAPORT, hdr,
-                      sizeof(struct e8390_pkt_hdr));
+               ioread8_rep(nic_base + NE_DATAPORT, hdr,
+                           sizeof(struct e8390_pkt_hdr));
 
        ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
        ei_local->dmaing &= ~0x01;
@@ -237,12 +237,12 @@ static void ax_block_input(struct net_device *dev, int count,
        ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
 
        if (ei_local->word16) {
-               readsw(nic_base + NE_DATAPORT, buf, count >> 1);
+               ioread16_rep(nic_base + NE_DATAPORT, buf, count >> 1);
                if (count & 0x01)
                        buf[count-1] = ei_inb(nic_base + NE_DATAPORT);
 
        } else {
-               readsb(nic_base + NE_DATAPORT, buf, count);
+               ioread8_rep(nic_base + NE_DATAPORT, buf, count);
        }
 
        ei_local->dmaing &= ~1;
@@ -286,9 +286,9 @@ static void ax_block_output(struct net_device *dev, int count,
 
        ei_outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
        if (ei_local->word16)
-               writesw(nic_base + NE_DATAPORT, buf, count >> 1);
+               iowrite16_rep(nic_base + NE_DATAPORT, buf, count >> 1);
        else
-               writesb(nic_base + NE_DATAPORT, buf, count);
+               iowrite8_rep(nic_base + NE_DATAPORT, buf, count);
 
        dma_start = jiffies;