diff mbox series

[v7,4/4] mtd: cfi_cmdset_0002: Rename chip_ready variables

Message ID 20220323170458.5608-5-ikegami.t@gmail.com
State Accepted
Headers show
Series mtd: cfi_cmdset_0002: Use chip_ready() for write on S29GL064N | expand

Commit Message

Tokunori Ikegami March 23, 2022, 5:04 p.m. UTC 
Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Miquel Raynal April 28, 2022, 8:18 a.m. UTC | #1 
On Wed, 2022-03-23 at 17:04:58 UTC, Tokunori Ikegami wrote:
> Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel
diff mbox series

Patch

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index b31439e44435..67453f59c69c 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -834,7 +834,7 @@  static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
 			       unsigned long addr, map_word *expected)
 {
 	struct cfi_private *cfi = map->fldrv_priv;
-	map_word d, t;
+	map_word oldd, curd;
 	int ret;
 
 	if (cfi_use_status_reg(cfi)) {
@@ -845,20 +845,20 @@  static int __xipram chip_ready(struct map_info *map, struct flchip *chip,
 		 */
 		cfi_send_gen_cmd(0x70, cfi->addr_unlock1, chip->start, map, cfi,
 				 cfi->device_type, NULL);
-		t = map_read(map, addr);
+		curd = map_read(map, addr);
 
-		return map_word_andequal(map, t, ready, ready);
+		return map_word_andequal(map, curd, ready, ready);
 	}
 
-	d = map_read(map, addr);
-	t = map_read(map, addr);
+	oldd = map_read(map, addr);
+	curd = map_read(map, addr);
 
-	ret = map_word_equal(map, d, t);
+	ret = map_word_equal(map, oldd, curd);
 
 	if (!ret || !expected)
 		return ret;
 
-	return map_word_equal(map, t, *expected);
+	return map_word_equal(map, curd, *expected);
 }
 
 static int __xipram chip_good(struct map_info *map, struct flchip *chip,