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

Commit 82045362 authored by Matthew Leach's avatar Matthew Leach Committed by Artem Bityutskiy
Browse files

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

Signed-off-by: default avatarMatthew Leach <matthew@mattleach.net>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 031da73f

drivers/mtd/nand/gpio.c

+4 −4
Original line number Diff line number Diff line
@@ -90,14 +90,14 @@ static void gpio_nand_writebuf(struct mtd_info *mtd, const u_char *buf, int len) 
{

	struct nand_chip *this = mtd->priv;



	writesb(this->IO_ADDR_W, buf, len);

	iowrite8_rep(this->IO_ADDR_W, buf, len);

}



static void gpio_nand_readbuf(struct mtd_info *mtd, u_char *buf, int len)

{

	struct nand_chip *this = mtd->priv;



	readsb(this->IO_ADDR_R, buf, len);

	ioread8_rep(this->IO_ADDR_R, buf, len);

}



static void gpio_nand_writebuf16(struct mtd_info *mtd, const u_char *buf,
@@ -106,7 +106,7 @@ static void gpio_nand_writebuf16(struct mtd_info *mtd, const u_char *buf, 
	struct nand_chip *this = mtd->priv;



	if (IS_ALIGNED((unsigned long)buf, 2)) {

		writesw(this->IO_ADDR_W, buf, len>>1);

		iowrite16_rep(this->IO_ADDR_W, buf, len>>1);

	} else {

		int i;

		unsigned short *ptr = (unsigned short *)buf;
@@ -121,7 +121,7 @@ static void gpio_nand_readbuf16(struct mtd_info *mtd, u_char *buf, int len) 
	struct nand_chip *this = mtd->priv;



	if (IS_ALIGNED((unsigned long)buf, 2)) {

		readsw(this->IO_ADDR_R, buf, len>>1);

		ioread16_rep(this->IO_ADDR_R, buf, len>>1);

	} else {

		int i;

		unsigned short *ptr = (unsigned short *)buf;