Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aef9b78 authored by Brian Norris's avatar Brian Norris Committed by David Woodhouse
Browse files

mtd: nand: remove redundant ID read 



Instead of reading 2 bytes then later 8 bytes, we can simply read all 8
bytes from the start.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 47450b35

drivers/mtd/nand/nand_base.c

+2 −8
Original line number Diff line number Diff line
@@ -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) {
@@ -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);