Skip to content

Commit

Permalink
mtd: nand: remove redundant ID read
Browse files Browse the repository at this point in the history
Instead of reading 2 bytes then later 8 bytes, we can simply read all 8
bytes from the start.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Brian Norris authored and David Woodhouse committed Sep 29, 2012
1 parent 47450b3 commit 4aef9b7
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/mtd/nand/nand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2942,7 +2942,8 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,

chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);

for (i = 0; i < 2; i++)
/* Read entire ID string */
for (i = 0; i < 8; i++)
id_data[i] = chip->read_byte(mtd);

if (id_data[0] != *maf_id || id_data[1] != *dev_id) {
Expand All @@ -2966,13 +2967,6 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
goto ident_done;
}

chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);

/* Read entire ID string */

for (i = 0; i < 8; i++)
id_data[i] = chip->read_byte(mtd);

if (!type->name)
return ERR_PTR(-ENODEV);

Expand Down

0 comments on commit 4aef9b7

Please sign in to comment.