3.16.61-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tokunori Ikegami <ikeg...@allied-telesis.co.jp>
commit 85a82e28b023de9b259a86824afbd6ba07bd6475 upstream.
The definition can be used for other program and erase operations also.
So change the naming to MAX_RETRIES from MAX_WORD_RETRIES.
Signed-off-by: Tokunori Ikegami <ikeg...@allied-telesis.co.jp>
Reviewed-by: Joakim Tjernlund <joakim.tjernl...@infinera.com>
Cc: Chris Packham <chris.pack...@alliedtelesis.co.nz>
Cc: Brian Norris <computersforpe...@gmail.com>
Cc: David Woodhouse <dw...@infradead.org>
Cc: Boris Brezillon <boris.brezil...@free-electrons.com>
Cc: Marek Vasut <marek.va...@gmail.com>
Cc: Richard Weinberger <rich...@nod.at>
Cc: Cyrille Pitchen <cyrille.pitc...@wedev4u.fr>
Cc: linux-...@lists.infradead.org
Signed-off-by: Boris Brezillon <boris.brezil...@bootlin.com>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
drivers/mtd/chips/cfi_cmdset_0002.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -42,7 +42,7 @@
#define AMD_BOOTLOC_BUG
#define FORCE_WORD_WRITE 0
-#define MAX_WORD_RETRIES 3
+#define MAX_RETRIES 3
#define SST49LF004B 0x0060
#define SST49LF040B 0x0050
@@ -1314,7 +1314,7 @@ static int __xipram do_write_oneword(str
map_write( map, CMD(0xF0), chip->start );
/* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_WORD_RETRIES)
+ if (++retry_cnt <= MAX_RETRIES)
goto retry;
ret = -EIO;
@@ -1765,7 +1765,7 @@ retry:
map_write(map, CMD(0xF0), chip->start);
/* FIXME - should have reset delay before continuing */
- if (++retry_cnt <= MAX_WORD_RETRIES)
+ if (++retry_cnt <= MAX_RETRIES)
goto retry;
ret = -EIO;
