mtd: cfi_cmdset_0002: Rename chip_ready variables
authorTokunori Ikegami <ikegami.t@gmail.com>
Wed, 23 Mar 2022 17:04:58 +0000 (02:04 +0900)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Thu, 28 Apr 2022 08:17:22 +0000 (10:17 +0200)
Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220323170458.5608-5-ikegami.t@gmail.com
drivers/mtd/chips/cfi_cmdset_0002.c

index b31439e..67453f5 100644 (file)
@@ -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,