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

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

mtd: remove retlen zeroing duplication 



The MTD API function now zero the 'retlen' parameter before calling
the driver's method — do not do this again in drivers. This removes
duplicated '*retlen = 0' assignent from the following methods:

    'mtd_point()'
    'mtd_read()'
    'mtd_write()'
    'mtd_writev()'
    'mtd_panic_write()'

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

drivers/mtd/chips/cfi_cmdset_0001.c

+0 −5
Original line number Diff line number Diff line
@@ -1334,7 +1334,6 @@ static int cfi_intelext_point(struct mtd_info *mtd, loff_t from, size_t len, 
	ofs = from - (chipnum << cfi->chipshift);



	*virt = map->virt + cfi->chips[chipnum].start + ofs;

	*retlen = 0;

	if (phys)

		*phys = map->phys + cfi->chips[chipnum].start + ofs;
@@ -1460,8 +1459,6 @@ static int cfi_intelext_read (struct mtd_info *mtd, loff_t from, size_t len, siz 
	chipnum = (from >> cfi->chipshift);

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



	*retlen = 0;



	while (len) {

		unsigned long thislen;
@@ -1569,7 +1566,6 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le 
	int chipnum;

	unsigned long ofs;



	*retlen = 0;

	if (!len)

		return 0;
@@ -1817,7 +1813,6 @@ static int cfi_intelext_writev (struct mtd_info *mtd, const struct kvec *vecs, 
	for (i = 0; i < count; i++)

		len += vecs[i].iov_len;



	*retlen = 0;

	if (!len)

		return 0;

drivers/mtd/chips/cfi_cmdset_0002.c

+0 −12
Original line number Diff line number Diff line
@@ -1017,13 +1017,9 @@ static int cfi_amdstd_read (struct mtd_info *mtd, loff_t from, size_t len, size_ 
	int ret = 0;



	/* ofs: offset within the first chip that the first read should start */



	chipnum = (from >> cfi->chipshift);

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





	*retlen = 0;



	while (len) {

		unsigned long thislen;
@@ -1101,16 +1097,11 @@ static int cfi_amdstd_secsi_read (struct mtd_info *mtd, loff_t from, size_t len, 
	int chipnum;

	int ret = 0;





	/* ofs: offset within the first chip that the first read should start */



	/* 8 secsi bytes per chip */

	chipnum=from>>3;

	ofs=from & 7;





	*retlen = 0;



	while (len) {

		unsigned long thislen;
@@ -1255,7 +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);



	*retlen = 0;

	if (!len)

		return 0;
@@ -1497,7 +1487,6 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, 
	int chipnum;

	unsigned long ofs;



	*retlen = 0;

	if (!len)

		return 0;
@@ -1708,7 +1697,6 @@ static int cfi_amdstd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, 
	int ret = 0;

	int chipnum;



	*retlen = 0;

	if (!len)

		return 0;

drivers/mtd/chips/cfi_cmdset_0020.c

+0 −3
Original line number Diff line number Diff line
@@ -394,8 +394,6 @@ static int cfi_staa_read (struct mtd_info *mtd, loff_t from, size_t len, size_t 
	chipnum = (from >> cfi->chipshift);

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



	*retlen = 0;



	while (len) {

		unsigned long thislen;
@@ -617,7 +615,6 @@ static int cfi_staa_write_buffers (struct mtd_info *mtd, loff_t to, 
	int chipnum;

	unsigned long ofs;



	*retlen = 0;

	if (!len)

		return 0;

drivers/mtd/chips/map_absent.c

+0 −2
Original line number Diff line number Diff line
@@ -70,13 +70,11 @@ static struct mtd_info *map_absent_probe(struct map_info *map) 


static int map_absent_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)

{

	*retlen = 0;

	return -ENODEV;

}



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

{

	*retlen = 0;

	return -ENODEV;

}

drivers/mtd/devices/block2mtd.c

+0 −5
Original line number Diff line number Diff line
@@ -104,9 +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 (retlen)

		*retlen = 0;



	while (len) {

		if ((offset + len) > PAGE_SIZE)

			cpylen = PAGE_SIZE - offset;	// multiple pages
@@ -143,8 +140,6 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf, 
	int offset = to & ~PAGE_MASK;	// page offset

	int cpylen;



	if (retlen)

		*retlen = 0;

	while (len) {

		if ((offset+len) > PAGE_SIZE)

			cpylen = PAGE_SIZE - offset;	// multiple pages