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

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

mtd: move zero length verification to MTD API functions 



In many places in drivers we verify for the zero length, but this is very
inconsistent across drivers. This is obviously the right thing to do, though.
This patch moves the check to the MTD API functions instead and removes a lot
of duplication.

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

drivers/mtd/chips/cfi_cmdset_0001.c

+0 −3
Original line number Diff line number Diff line
@@ -1566,9 +1566,6 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le 
	int chipnum;

	unsigned long ofs;



	if (!len)

		return 0;



	chipnum = to >> cfi->chipshift;

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

drivers/mtd/chips/cfi_cmdset_0002.c

+0 −9
Original line number Diff line number Diff line
@@ -1246,9 +1246,6 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 
	unsigned long ofs, chipstart;

	DECLARE_WAITQUEUE(wait, current);



	if (!len)

		return 0;



	chipnum = to >> cfi->chipshift;

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

	chipstart = cfi->chips[chipnum].start;
@@ -1487,9 +1484,6 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, 
	int chipnum;

	unsigned long ofs;



	if (!len)

		return 0;



	chipnum = to >> cfi->chipshift;

	ofs = to  - (chipnum << cfi->chipshift);
@@ -1697,9 +1691,6 @@ static int cfi_amdstd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, 
	int ret = 0;

	int chipnum;



	if (!len)

		return 0;



	chipnum = to >> cfi->chipshift;

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

	chipstart = cfi->chips[chipnum].start;

drivers/mtd/chips/cfi_cmdset_0020.c

+0 −3
Original line number Diff line number Diff line
@@ -615,9 +615,6 @@ static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to, 
	int chipnum;

	unsigned long ofs;



	if (!len)

		return 0;



	chipnum = to >> cfi->chipshift;

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

drivers/mtd/devices/block2mtd.c

+0 −3
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@ static int block2mtd_write(struct mtd_info *mtd, loff_t to, size_t len, 
	struct block2mtd_dev *dev = mtd->priv;

	int err;



	if (!len)

		return 0;



	mutex_lock(&dev->write_mutex);

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

	mutex_unlock(&dev->write_mutex);

drivers/mtd/devices/lart.c

+0 −3
Original line number Diff line number Diff line
@@ -437,9 +437,6 @@ static int flash_read (struct mtd_info *mtd,loff_t from,size_t len,size_t *retle 
   printk (KERN_DEBUG "%s(from = 0x%.8x, len = %d)\n", __func__, (__u32)from, len);

#endif



   /* sanity checks */

   if (!len) return (0);



   /* we always read len bytes */

   *retlen = len;