[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 11 Nov 2018 19:49:05 +0000
From: Ben Hutchings <ben@...adent.org.uk>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC: akpm@...ux-foundation.org,
"Boris Brezillon" <boris.brezillon@...tlin.com>,
"Tokunori Ikegami" <ikegami@...ied-telesis.co.jp>,
linux-mtd@...ts.infradead.org,
"Marek Vasut" <marek.vasut@...il.com>,
"Boris Brezillon" <boris.brezillon@...e-electrons.com>,
"Chris Packham" <chris.packham@...iedtelesis.co.nz>,
"Brian Norris" <computersforpeace@...il.com>,
"Cyrille Pitchen" <cyrille.pitchen@...ev4u.fr>,
"David Woodhouse" <dwmw2@...radead.org>,
"Joakim Tjernlund" <Joakim.Tjernlund@...inera.com>,
"Richard Weinberger" <richard@....at>
Subject: [PATCH 3.16 097/366] mtd: cfi_cmdset_0002: Change definition
naming to retry write operation
3.16.61-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Tokunori Ikegami <ikegami@...ied-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 <ikegami@...ied-telesis.co.jp>
Reviewed-by: Joakim Tjernlund <Joakim.Tjernlund@...inera.com>
Cc: Chris Packham <chris.packham@...iedtelesis.co.nz>
Cc: Brian Norris <computersforpeace@...il.com>
Cc: David Woodhouse <dwmw2@...radead.org>
Cc: Boris Brezillon <boris.brezillon@...e-electrons.com>
Cc: Marek Vasut <marek.vasut@...il.com>
Cc: Richard Weinberger <richard@....at>
Cc: Cyrille Pitchen <cyrille.pitchen@...ev4u.fr>
Cc: linux-mtd@...ts.infradead.org
Signed-off-by: Boris Brezillon <boris.brezillon@...tlin.com>
Signed-off-by: Ben Hutchings <ben@...adent.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;
Powered by blists - more mailing lists