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

Commit 3b27dac0 authored by Shmulik Ladkani's avatar Shmulik Ladkani Committed by David Woodhouse
Browse files

mtd: unify initialization of erase_info->fail_addr 



Initialization of 'erase_info->fail_addr' to MTD_FAIL_ADDR_UNKNOWN prior
erase operation is duplicated accross several MTD drivers, and also taken
care of by some MTD users as well.

Harmonize it: initialize 'fail_addr' within 'mtd_erase()' interface.

Signed-off-by: default avatarShmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 63795755

drivers/mtd/mtdconcat.c

+0 −2
Original line number Diff line number Diff line
@@ -426,8 +426,6 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) 
			return -EINVAL;

	}



	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;



	/* make a local copy of instr to avoid modifying the caller's struct */

	erase = kmalloc(sizeof (struct erase_info), GFP_KERNEL);

drivers/mtd/mtdcore.c

+1 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ int mtd_erase(struct mtd_info *mtd, struct erase_info *instr) 
		return -EINVAL;

	if (!(mtd->flags & MTD_WRITEABLE))

		return -EROFS;

	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;

	if (!instr->len) {

		instr->state = MTD_ERASE_DONE;

		mtd_erase_callback(instr);

drivers/mtd/nand/nand_base.c

+0 −2
Original line number Diff line number Diff line
@@ -2550,8 +2550,6 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, 
	if (check_offs_len(mtd, instr->addr, instr->len))

		return -EINVAL;



	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;



	/* Grab the lock and see if the device is available */

	nand_get_device(chip, mtd, FL_ERASING);

drivers/mtd/onenand/onenand_base.c

+0 −2
Original line number Diff line number Diff line
@@ -2502,8 +2502,6 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) 
		return -EINVAL;

	}



	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;



	/* Grab the lock and see if the device is available */

	onenand_get_device(mtd, FL_ERASING);

fs/jffs2/erase.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static void jffs2_erase_block(struct jffs2_sb_info *c, 
	instr->len = c->sector_size;

	instr->callback = jffs2_erase_callback;

	instr->priv = (unsigned long)(&instr[1]);

	instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN;



	((struct erase_priv_struct *)instr->priv)->jeb = jeb;

	((struct erase_priv_struct *)instr->priv)->c = c;