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

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

net: dm9000: 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 default
DM9000 accessors with io{read,write}{8,16,32}_rep calls instead. This
is required as the dm9000 driver is in use by the blackfin
architecture which uses the asm-generic io accessors.

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 4ba73aa1

drivers/net/ethernet/davicom/dm9000.c

+6 −6
Original line number Diff line number Diff line
@@ -193,35 +193,35 @@ iow(board_info_t * db, int reg, int value) 


static void dm9000_outblk_8bit(void __iomem *reg, void *data, int count)

{

	writesb(reg, data, count);

	iowrite8_rep(reg, data, count);

}



static void dm9000_outblk_16bit(void __iomem *reg, void *data, int count)

{

	writesw(reg, data, (count+1) >> 1);

	iowrite16_rep(reg, data, (count+1) >> 1);

}



static void dm9000_outblk_32bit(void __iomem *reg, void *data, int count)

{

	writesl(reg, data, (count+3) >> 2);

	iowrite32_rep(reg, data, (count+3) >> 2);

}



/* input block from chip to memory */



static void dm9000_inblk_8bit(void __iomem *reg, void *data, int count)

{

	readsb(reg, data, count);

	ioread8_rep(reg, data, count);

}





static void dm9000_inblk_16bit(void __iomem *reg, void *data, int count)

{

	readsw(reg, data, (count+1) >> 1);

	ioread16_rep(reg, data, (count+1) >> 1);

}



static void dm9000_inblk_32bit(void __iomem *reg, void *data, int count)

{

	readsl(reg, data, (count+3) >> 2);

	ioread32_rep(reg, data, (count+3) >> 2);

}



/* dump block from chip to null */