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

Commit 664addc2 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: remove R/O checking duplication 



Many drivers check whether the partition is R/O and return -EROFS if yes.
Let's stop having duplicated checks and move them to the API functions
instead.

And again a bit of noise - deleted few too sparse newlines, sorry.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 5def4898

drivers/mtd/chips/map_ram.c

+0 −4
Original line number Diff line number Diff line
@@ -122,14 +122,10 @@ static int mapram_erase (struct mtd_info *mtd, struct erase_info *instr) 
	unsigned long i;



	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/chips/map_rom.c

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ static void maprom_nop(struct mtd_info *mtd) 


static int maprom_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)

{

	printk(KERN_NOTICE "maprom_write called\n");

	return -EIO;

	return -EROFS;

}



static int maprom_erase (struct mtd_info *mtd, struct erase_info *info)

drivers/mtd/devices/phram.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct phram_mtd_list { 


static LIST_HEAD(phram_list);





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

{

	u_char *start = mtd->priv;

drivers/mtd/mtdconcat.c

+3 −24
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len, 
	int err = -EINVAL;

	int i;



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

		return -EROFS;



	*retlen = 0;



	for (i = 0; i < concat->num_subdev; i++) {
@@ -145,11 +142,7 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len, 
		else

			size = len;



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

			err = -EROFS;

		else

		err = mtd_write(subdev, to, size, &retsize, buf);



		if (err)

			break;
@@ -176,9 +169,6 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs, 
	int i;

	int err = -EINVAL;



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

		return -EROFS;



	*retlen = 0;



	/* Calculate total length of data */
@@ -220,12 +210,8 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs, 
		old_iov_len = vecs_copy[entry_high].iov_len;

		vecs_copy[entry_high].iov_len = size;



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

			err = -EROFS;

		else

		err = mtd_writev(subdev, &vecs_copy[entry_low],

					 entry_high - entry_low + 1, to,

					 &retsize);

				 entry_high - entry_low + 1, to, &retsize);



		vecs_copy[entry_high].iov_len = old_iov_len - size;

		vecs_copy[entry_high].iov_base += size;
@@ -399,9 +385,6 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) 
	uint64_t length, offset = 0;

	struct erase_info *erase;



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

		return -EROFS;



	/*

	 * Check for proper erase block alignment of the to-be-erased area.

	 * It is easier to do this based on the super device's erase
@@ -489,10 +472,6 @@ static int concat_erase(struct mtd_info *mtd, struct erase_info *instr) 
		else

			erase->len = length;



		if (!(subdev->flags & MTD_WRITEABLE)) {

			err = -EROFS;

			break;

		}

		length -= erase->len;

		if ((err = concat_dev_erase(subdev, erase))) {

			/* sanity check: should never happen since

drivers/mtd/mtdcore.c

+10 −2
Original line number Diff line number Diff line
@@ -693,6 +693,8 @@ int mtd_erase(struct mtd_info *mtd, struct erase_info *instr) 
{

	if (instr->addr > mtd->size || instr->len > mtd->size - instr->addr)

		return -EINVAL;

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

		return -EROFS;

	return mtd->_erase(mtd, instr);

}

EXPORT_SYMBOL_GPL(mtd_erase);
@@ -752,10 +754,10 @@ int mtd_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, 
	      const u_char *buf)

{

	*retlen = 0;

	if (!mtd->_write)

		return -EROFS;

	if (to < 0 || to > mtd->size || len > mtd->size - to)

		return -EINVAL;

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

		return -EROFS;

	return mtd->_write(mtd, to, len, retlen, buf);

}

EXPORT_SYMBOL_GPL(mtd_write);
@@ -775,6 +777,8 @@ int mtd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, 
		return -EOPNOTSUPP;

	if (to < 0 || to > mtd->size || len > mtd->size - to)

		return -EINVAL;

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

		return -EROFS;

	return mtd->_panic_write(mtd, to, len, retlen, buf);

}

EXPORT_SYMBOL_GPL(mtd_panic_write);
@@ -826,6 +830,8 @@ int mtd_block_markbad(struct mtd_info *mtd, loff_t ofs) 
		return -EOPNOTSUPP;

	if (ofs < 0 || ofs > mtd->size)

		return -EINVAL;

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

		return -EROFS;

	return mtd->_block_markbad(mtd, ofs);

}

EXPORT_SYMBOL_GPL(mtd_block_markbad);
@@ -877,6 +883,8 @@ int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs, 
	       unsigned long count, loff_t to, size_t *retlen)

{

	*retlen = 0;

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

		return -EROFS;

	if (!mtd->_writev)

		return default_mtd_writev(mtd, vecs, count, to, retlen);

	return mtd->_writev(mtd, vecs, count, to, retlen);