Skip to contentSkip to conversation

FAILED: patch "[PATCH] mtd: cfi_cmdset_0002: Change definition naming to retry write" failed to apply to 4.17-stable tree

PATCH [email protected] 1 participant 1 message Jul 1, 2018

Subsystems (2)
Stable branch Memory technology devices (MTD)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.17-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 85a82e28b023de9b259a86824afbd6ba07bd6475 Mon Sep 17 00:00:00 2001

From: Tokunori Ikegami <[email protected]>
Date: Wed, 30 May 2018 18:32:27 +0900
Subject: [PATCH] mtd: cfi_cmdset_0002: Change definition naming to retry write
operation

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 <[email protected]>
Reviewed-by Joakim Tjernlund <[email protected]>
Cc Chris Packham <[email protected]>
Cc Brian Norris <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Boris Brezillon <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Cyrille Pitchen <[email protected]>
Cc [email protected]
Cc [email protected]
Signed-off-by Boris Brezillon <[email protected]>
drivers/mtd/chips/cfi_cmdset_0002.c +3 -3
index 75d2c16029fd..62ada405fe93 100644
@@ -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

@@ -1646,7 +1646,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
 		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;

@@ -2105,7 +2105,7 @@ static int do_panic_write_oneword(struct map_info *map, struct flchip *chip,
 		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;