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

Commit 47450b35 authored by Brian Norris's avatar Brian Norris Committed by David Woodhouse
Browse files

mtd: nand: remove unnecessary variable 



We don't actually use the 'ret' variable; we set it, test it, and then it dies.

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 e5570f0c

drivers/mtd/nand/nand_base.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -2916,7 +2916,6 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
{

{

	int i, maf_idx;

	int i, maf_idx;

	u8 id_data[8];

	u8 id_data[8];

	int ret;





	/* Select the device */

	/* Select the device */

	chip->select_chip(mtd, 0);

	chip->select_chip(mtd, 0);
@@ -2963,8 +2962,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, 
	chip->onfi_version = 0;

	chip->onfi_version = 0;

	if (!type->name || !type->pagesize) {

	if (!type->name || !type->pagesize) {

		/* Check is chip is ONFI compliant */

		/* Check is chip is ONFI compliant */

		ret = nand_flash_detect_onfi(mtd, chip, &busw);

		if (nand_flash_detect_onfi(mtd, chip, &busw))

		if (ret)

			goto ident_done;

			goto ident_done;

	}

	}