aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorTokunori Ikegami <ikegami.t@gmail.com>2022-03-24 02:04:58 +0900
committerMiquel Raynal <miquel.raynal@bootlin.com>2022-04-28 10:17:22 +0200
commit43823c5c56f247cfc028bf90299f675dd29abf88 (patch)
tree1089482ae1f9a714ca81886085343a6dcc6a5522 /drivers/mtd
parentmtd: cfi_cmdset_0002: Add S29GL064N ID definition (diff)
downloadlinux-dev-43823c5c56f247cfc028bf90299f675dd29abf88.tar.xz
linux-dev-43823c5c56f247cfc028bf90299f675dd29abf88.zip
mtd: cfi_cmdset_0002: Rename chip_ready variables
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
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/chips/cfi_cmdset_0002.c14
1 files changed, 7 insertions, 7 deletions
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,