18 files changed, 1 insertions, 73 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 27008ae8f695..dc66df6ab58a 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -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;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 27ac0622abe3..a89d899efad4 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -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;
 
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 160402fb65d1..d690b7d6952b 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -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;
 
diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
index 6be2eddfea45..f7a5bca92aef 100644
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
@@ -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;
 }
 
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));
 
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 0f3731c6b3f6..a92906ba535d 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -535,9 +535,7 @@ static int lpddr_point(struct mtd_info *mtd, loff_t adr, size_t len,
 
         /* ofs: offset within the first chip that the first read should start */
         ofs = adr - (chipnum << lpddr->chipshift);
-
         *mtdbuf = (void *)map->virt + chip->start + ofs;
-        *retlen = 0;
 
         while (len) {
                 unsigned long thislen;
@@ -647,7 +645,6 @@ static int lpddr_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;
 
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index dd24232265e6..f7a31cc44480 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -72,8 +72,6 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len,
         int ret = 0, err;
         int i;
 
-        *retlen = 0;
-
         for (i = 0; i < concat->num_subdev; i++) {
                 struct mtd_info *subdev = concat->subdev[i];
                 size_t size, retsize;
@@ -126,8 +124,6 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,
         int err = -EINVAL;
         int i;
 
-        *retlen = 0;
-
         for (i = 0; i < concat->num_subdev; i++) {
                 struct mtd_info *subdev = concat->subdev[i];
                 size_t size, retsize;
@@ -169,8 +165,6 @@ concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
         int i;
         int err = -EINVAL;
 
-        *retlen = 0;
-
         /* Calculate total length of data */
         for (i = 0; i < count; i++)
                 total_len += vecs[i].iov_len;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index b9b28647adef..ead52b388492 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -744,6 +744,7 @@ EXPORT_SYMBOL_GPL(mtd_get_unmapped_area);
 int mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen,
              u_char *buf)
 {
+        *retlen = 0;
         if (from < 0 || from > mtd->size || len > mtd->size - from)
                 return -EINVAL;
         return mtd->_read(mtd, from, len, retlen, buf);
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 9c6445d372ce..a1592cf755f3 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1753,9 +1753,6 @@ static int onenand_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
         pr_debug("%s: to = 0x%08x, len = %i\n", __func__, (unsigned int)to,
                         (int)len);
 
-        /* Initialize retlen, in case of early exit */
-        *retlen = 0;
-
         /* Reject writes, which are not page aligned */
         if (unlikely(NOTALIGNED(to) || NOTALIGNED(len))) {
                 printk(KERN_ERR "%s: Attempt to write not page aligned data\n",