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

Commit e7bfb3fd authored by Boris Brezillon's avatar Boris Brezillon
Browse files

mtd: Stop updating erase_info->state and calling mtd_erase_callback() 



MTD users are no longer checking erase_info->state to determine if the
erase operation failed or succeeded. Moreover, mtd_erase_callback() is
now a NOP.

We can safely get rid of all mtd_erase_callback() calls and all
erase_info->state assignments. While at it, get rid of the
erase_info->state field, all MTD_ERASE_XXX definitions and the
mtd_erase_callback() function.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarBert Kenward <bkenward@solarflare.com>
---
Changes in v2:
- Address a few coding style issues (reported by Miquel)
- Remove comments that are no longer valid (reported by Miquel)
parent 8f347c42

drivers/mtd/chips/cfi_cmdset_0001.c

+2 −14
Original line number Diff line number Diff line
@@ -1993,20 +1993,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 


static int cfi_intelext_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)

{

	unsigned long ofs, len;

	int ret;



	ofs = instr->addr;

	len = instr->len;



	ret = cfi_varsize_frob(mtd, do_erase_oneblock, ofs, len, NULL);

	if (ret)

		return ret;



	instr->state = MTD_ERASE_DONE;

	mtd_erase_callback(instr);



	return 0;

	return cfi_varsize_frob(mtd, do_erase_oneblock, instr->addr,

				instr->len, NULL);

}



static void cfi_intelext_sync (struct mtd_info *mtd)

drivers/mtd/chips/cfi_cmdset_0002.c

+3 −23
Original line number Diff line number Diff line
@@ -2415,20 +2415,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 


static int cfi_amdstd_erase_varsize(struct mtd_info *mtd, struct erase_info *instr)

{

	unsigned long ofs, len;

	int ret;



	ofs = instr->addr;

	len = instr->len;



	ret = cfi_varsize_frob(mtd, do_erase_oneblock, ofs, len, NULL);

	if (ret)

		return ret;



	instr->state = MTD_ERASE_DONE;

	mtd_erase_callback(instr);



	return 0;

	return cfi_varsize_frob(mtd, do_erase_oneblock, instr->addr,

				instr->len, NULL);

}
@@ -2436,7 +2424,6 @@ static int cfi_amdstd_erase_chip(struct mtd_info *mtd, struct erase_info *instr) 
{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;

	int ret = 0;



	if (instr->addr != 0)

		return -EINVAL;
@@ -2444,14 +2431,7 @@ static int cfi_amdstd_erase_chip(struct mtd_info *mtd, struct erase_info *instr) 
	if (instr->len != mtd->size)

		return -EINVAL;



	ret = do_erase_chip(map, &cfi->chips[0]);

	if (ret)

		return ret;



	instr->state = MTD_ERASE_DONE;

	mtd_erase_callback(instr);



	return 0;

	return do_erase_chip(map, &cfi->chips[0]);

}



static int do_atmel_lock(struct map_info *map, struct flchip *chip,

drivers/mtd/chips/cfi_cmdset_0020.c

+0 −3
Original line number Diff line number Diff line
@@ -965,9 +965,6 @@ static int cfi_staa_erase_varsize(struct mtd_info *mtd, 
		}

	}



	instr->state = MTD_ERASE_DONE;

	mtd_erase_callback(instr);



	return 0;

}

drivers/mtd/chips/map_ram.c

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ static int mapram_erase (struct mtd_info *mtd, struct erase_info *instr) 
	allff = map_word_ff(map);

	for (i=0; i<instr->len; i += map_bankwidth(map))

		map_write(map, allff, instr->addr + i);

	instr->state = MTD_ERASE_DONE;

	mtd_erase_callback(instr);

	return 0;

}

drivers/mtd/devices/bcm47xxsflash.c

+1 −8
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static int bcm47xxsflash_poll(struct bcm47xxsflash *b47s, int timeout) 
static int bcm47xxsflash_erase(struct mtd_info *mtd, struct erase_info *erase)

{

	struct bcm47xxsflash *b47s = mtd->priv;

	int err;



	switch (b47s->type) {

	case BCM47XXSFLASH_TYPE_ST:
@@ -89,13 +88,7 @@ static int bcm47xxsflash_erase(struct mtd_info *mtd, struct erase_info *erase) 
		break;

	}



	err = bcm47xxsflash_poll(b47s, HZ);

	if (err)

		erase->state = MTD_ERASE_FAILED;

	else

		erase->state = MTD_ERASE_DONE;



	return err;

	return bcm47xxsflash_poll(b47s, HZ);

}



static int bcm47xxsflash_read(struct mtd_info *mtd, loff_t from, size_t len,