Skip to content

Commit

Permalink
mtd/m25p80: retlen is never NULL
Browse files Browse the repository at this point in the history
This is just a cleanup, it doesn't fix any bugs.

These functions all check retlen inconsistently and it generates a
warning in Smatch (http://smatch.sf.net).  If retlen were ever NULL it
would cause an oops and the code has been this way since 2006 so someone
would have complained.  Also I looked at other places that implemented
the mtd read and write functions and they dereference retlen without
checking.

I removed the checks.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Dan Carpenter authored and David Woodhouse committed Aug 12, 2010
1 parent d2b5bbe commit b06cd21
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/mtd/devices/m25p80.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,7 @@ static int m25p80_read(struct mtd_info *mtd, loff_t from, size_t len,
spi_message_add_tail(&t[1], &m);

/* Byte count starts at zero. */
if (retlen)
*retlen = 0;
*retlen = 0;

mutex_lock(&flash->lock);

Expand Down Expand Up @@ -394,8 +393,7 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
dev_name(&flash->spi->dev), __func__, "to",
(u32)to, len);

if (retlen)
*retlen = 0;
*retlen = 0;

/* sanity checks */
if (!len)
Expand Down Expand Up @@ -466,8 +464,7 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,

spi_sync(flash->spi, &m);

if (retlen)
*retlen += m.actual_length - m25p_cmdsz(flash);
*retlen += m.actual_length - m25p_cmdsz(flash);
}
}

Expand All @@ -485,8 +482,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t actual;
int cmd_sz, ret;

if (retlen)
*retlen = 0;
*retlen = 0;

/* sanity checks */
if (!len)
Expand Down

0 comments on commit b06cd21

Please sign in to comment.