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

Commit 5def4898 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: do not duplicate length and offset checks in drivers 



We already verify that offset and length are within the MTD device size
in the MTD API functions. Let's remove the duplicated checks in drivers.
This patch only affects the following API's:

'mtd_erase()'
'mtd_point()'
'mtd_unpoint()'
'mtd_get_unmapped_area()'
'mtd_read()'
'mtd_write()'
'mtd_panic_write()'
'mtd_lock()'
'mtd_unlock()'
'mtd_is_locked()'
'mtd_block_isbad()'
'mtd_block_markbad()'

This patch adds a bit of noise by removing too sparse empty lines, but this is
not too bad.

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

drivers/mtd/chips/cfi_cmdset_0001.c

+1 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ static int cfi_intelext_point(struct mtd_info *mtd, loff_t from, size_t len, 
	int chipnum;

	int ret = 0;



	if (!map->virt || (from + len > mtd->size))

	if (!map->virt)

		return -EINVAL;



	/* Now lock the chip(s) to POINT state */

drivers/mtd/chips/cfi_cmdset_0020.c

+0 −9
Original line number Diff line number Diff line
@@ -904,12 +904,6 @@ static int cfi_staa_erase_varsize(struct mtd_info *mtd, 
	int i, first;

	struct mtd_erase_region_info *regions = mtd->eraseregions;



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

		return -EINVAL;



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

		return -EINVAL;



	/* Check that both start and end of the requested erase are

	 * aligned with the erasesize at the appropriate addresses.

	 */
@@ -1155,9 +1149,6 @@ static int cfi_staa_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) 
	if (len & (mtd->erasesize -1))

		return -EINVAL;



	if ((len + ofs) > mtd->size)

		return -EINVAL;



	chipnum = ofs >> cfi->chipshift;

	adr = ofs - (chipnum << cfi->chipshift);

drivers/mtd/chips/cfi_util.c

+0 −6
Original line number Diff line number Diff line
@@ -173,12 +173,6 @@ int cfi_varsize_frob(struct mtd_info *mtd, varsize_frob_t frob, 
	int i, first;

	struct mtd_erase_region_info *regions = mtd->eraseregions;



	if (ofs > mtd->size)

		return -EINVAL;



	if ((len + ofs) > mtd->size)

		return -EINVAL;



	/* Check that both start and end of the requested erase are

	 * aligned with the erasesize at the appropriate addresses.

	 */

drivers/mtd/devices/block2mtd.c

+0 −9
Original line number Diff line number Diff line
@@ -104,11 +104,6 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len, 
	int offset = from & (PAGE_SIZE-1);

	int cpylen;



	if (from > mtd->size)

		return -EINVAL;

	if (from + len > mtd->size)

		len = mtd->size - from;



	if (retlen)

		*retlen = 0;
@@ -190,10 +185,6 @@ static int block2mtd_write(struct mtd_info *mtd, loff_t to, size_t len, 


	if (!len)

		return 0;

	if (to >= mtd->size)

		return -ENOSPC;

	if (to + len > mtd->size)

		len = mtd->size - to;



	mutex_lock(&dev->write_mutex);

	err = _block2mtd_write(dev, buf, to, len, retlen);

drivers/mtd/devices/doc2000.c

+0 −8
Original line number Diff line number Diff line
@@ -602,10 +602,6 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len, 
	int i, len256 = 0, ret=0;

	size_t left = len;



	/* Don't allow read past end of device */

	if (from >= this->totlen)

		return -EINVAL;



	mutex_lock(&this->lock);



	*retlen = 0;
@@ -748,10 +744,6 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len, 
	size_t left = len;

	int status;



	/* Don't allow write past end of device */

	if (to >= this->totlen)

		return -EINVAL;



	mutex_lock(&this->lock);



	*retlen = 0;