Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b146ecd6 authored by Matthew Leach's avatar Matthew Leach Committed by David S. Miller
Browse files

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: default avatarMatthew Leach <matthew@mattleach.net>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent daadaf6f

drivers/net/ethernet/8390/ax88796.c

+8 −8
Original line number Diff line number Diff line
@@ -191,10 +191,10 @@ 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,

		ioread16_rep(nic_base + NE_DATAPORT, hdr,

			     sizeof(struct e8390_pkt_hdr) >> 1);

	else

		readsb(nic_base + NE_DATAPORT, hdr,

		ioread8_rep(nic_base + NE_DATAPORT, hdr,

			    sizeof(struct e8390_pkt_hdr));



	ei_outb(ENISR_RDC, nic_base + EN0_ISR);	/* Ack intr. */
@@ -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;