Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8204536207e99b3bbbd13d936aaa3b18449b9c00

Authored by Matthew Leach
Committed by Artem Bityutskiy
1 parent 031da73fca
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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: Matthew Leach <matthew@mattleach.net>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/mtd/nand/gpio.c
Diff comments   View file @ 8204536
... ... @@ -90,14 +90,14 @@
90 90 {
91 91 struct nand_chip *this = mtd->priv;
92 92  
93   - writesb(this->IO_ADDR_W, buf, len);
  93 + iowrite8_rep(this->IO_ADDR_W, buf, len);
94 94 }
95 95  
96 96 static void gpio_nand_readbuf(struct mtd_info *mtd, u_char *buf, int len)
97 97 {
98 98 struct nand_chip *this = mtd->priv;
99 99  
100   - readsb(this->IO_ADDR_R, buf, len);
  100 + ioread8_rep(this->IO_ADDR_R, buf, len);
101 101 }
102 102  
103 103 static void gpio_nand_writebuf16(struct mtd_info *mtd, const u_char *buf,
... ... @@ -106,7 +106,7 @@
106 106 struct nand_chip *this = mtd->priv;
107 107  
108 108 if (IS_ALIGNED((unsigned long)buf, 2)) {
109   - writesw(this->IO_ADDR_W, buf, len>>1);
  109 + iowrite16_rep(this->IO_ADDR_W, buf, len>>1);
110 110 } else {
111 111 int i;
112 112 unsigned short *ptr = (unsigned short *)buf;
... ... @@ -121,7 +121,7 @@
121 121 struct nand_chip *this = mtd->priv;
122 122  
123 123 if (IS_ALIGNED((unsigned long)buf, 2)) {
124   - readsw(this->IO_ADDR_R, buf, len>>1);
  124 + ioread16_rep(this->IO_ADDR_R, buf, len>>1);
125 125 } else {
126 126 int i;
127 127 unsigned short *ptr = (unsigned short *)buf;