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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

10 files changed, 0 insertions, 39 deletions

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 4c2f84c2a7c7..ba2d74b01c7e 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -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
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index ee4ee0b8440d..7ad7b054800c 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -603,8 +603,6 @@ static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,
         size_t left = len;
 
         mutex_lock(&this->lock);
-
-        *retlen = 0;
         while (left) {
                 len = left;
 
@@ -745,8 +743,6 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
         int status;
 
         mutex_lock(&this->lock);
-
-        *retlen = 0;
         while (left) {
                 len = left;
 
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 17844155a685..7bff54e62cd5 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -591,7 +591,6 @@ static int doc_write (struct mtd_info *mtd, loff_t to, size_t len,
                 printk("Error programming flash\n");
                 /* Error in programming
                    FIXME: implement Bad Block Replacement (in nftl.c ??) */
-                *retlen = 0;
                 ret = -EIO;
         }
         dummy = ReadDOC(docptr, LastDataRead);
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index a472bab7ef2b..4a03d869ad03 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -792,7 +792,6 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
                 printk("MTD: Error 0x%x programming at 0x%x\n", dummy, (int)to);
                 /* Error in programming
                    FIXME: implement Bad Block Replacement (in nftl.c ??) */
-                *retlen = 0;
                 ret = -EIO;
         }
         dummy = ReadDOC(docptr, Mplus_LastDataRead);
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index c9ae60112a90..6fb8dba76959 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -518,8 +518,6 @@ static int flash_write (struct mtd_info *mtd,loff_t to,size_t len,size_t *retlen
    printk (KERN_DEBUG "%s(to = 0x%.8x, len = %d)\n", __func__, (__u32)to, len);
 #endif
 
-   *retlen = 0;
-
    /* sanity checks */
    if (!len) return (0);
 
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 0955a8f4fd25..45cc4a1ae5b0 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -365,9 +365,6 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
         t[1].len = len;
         spi_message_add_tail(&t[1], &m);
 
-        /* Byte count starts at zero. */
-        *retlen = 0;
-
         mutex_lock(&flash->lock);
 
         /* Wait till previous write/erase is done. */
@@ -411,8 +408,6 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
         pr_debug("%s: %s to 0x%08x, len %zd\n", dev_name(&flash->spi->dev),
                         __func__, (u32)to, len);
 
-        *retlen = 0;
-
         /* sanity checks */
         if (!len)
                 return(0);
@@ -500,8 +495,6 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
         pr_debug("%s: %s to 0x%08x, len %zd\n", dev_name(&flash->spi->dev),
                         __func__, (u32)to, len);
 
-        *retlen = 0;
-
         /* sanity checks */
         if (!len)
                 return 0;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index fc5c78171844..c76b4464e8b9 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -249,8 +249,6 @@ static int dataflash_read(struct mtd_info *mtd, loff_t from, size_t len,
         pr_debug("%s: read 0x%x..0x%x\n", dev_name(&priv->spi->dev),
                         (unsigned)from, (unsigned)(from + len));
 
-        *retlen = 0;
-
         /* Sanity checks */
         if (!len)
                 return 0;
@@ -323,8 +321,6 @@ static int dataflash_write(struct mtd_info *mtd, loff_t to, size_t len,
         pr_debug("%s: write 0x%x..0x%x\n",
                 dev_name(&spi->dev), (unsigned)to, (unsigned)(to + len));
 
-        *retlen = 0;
-
         /* Sanity checks */
         if (!len)
                 return 0;
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index d0e8dc69fe1c..d3474a48d097 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -85,8 +85,6 @@ static int phram_write(struct mtd_info *mtd, loff_t to, size_t len,
         return 0;
 }
 
-
-
 static void unregister_devices(void)
 {
         struct phram_mtd_list *this, *safe;
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 2238ab916a06..2cdbcc65b39f 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -574,11 +574,6 @@ static int spear_mtd_read(struct mtd_info *mtd, loff_t from, size_t len,
                 return -EINVAL;
         }
 
-        if (!retlen)
-                return -EINVAL;
-        else
-                *retlen = 0;
-
         /* select address as per bank number */
         src = flash->base_addr + from;
 
@@ -675,11 +670,6 @@ static int spear_mtd_write(struct mtd_info *mtd, loff_t to, size_t len,
                 return -EINVAL;
         }
 
-        if (!retlen)
-                return -EINVAL;
-        else
-                *retlen = 0;
-
         /* select address as per bank number */
         dest = flash->base_addr + to;
         mutex_lock(&flash->lock);
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 99d4a3c510d7..5c2613c99e4a 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -224,9 +224,6 @@ static int sst25l_read(struct mtd_info *mtd, loff_t from, size_t len,
         if (len == 0)
                 return 0;
 
-        if (retlen)
-                *retlen = 0;
-
         spi_message_init(&message);
         memset(&transfer, 0, sizeof(transfer));