Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd/m25p80: retlen is never NULL

Browse Source 
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>
This commit is contained in:
Dan Carpenter 2010-08-12 09:53:52 +02:00 committed by David Woodhouse
parent d2b5bbef21
commit b06cd21e2f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/devices/m25p80.c
View File

@ -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); spi_message_add_tail(&t[1], &m);
/* Byte count starts at zero. */ /* Byte count starts at zero. */
if (retlen) *retlen = 0;
*retlen = 0;
mutex_lock(&flash->lock); mutex_lock(&flash->lock);
@ -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", dev_name(&flash->spi->dev), __func__, "to",
(u32)to, len); (u32)to, len);
if (retlen) *retlen = 0;
*retlen = 0;
/* sanity checks */ /* sanity checks */
if (!len) if (!len)
@ -466,8 +464,7 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
spi_sync(flash->spi, &m); spi_sync(flash->spi, &m);
if (retlen) *retlen += m.actual_length - m25p_cmdsz(flash);
*retlen += m.actual_length - m25p_cmdsz(flash);
} }
} }
@ -485,8 +482,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t actual; size_t actual;
int cmd_sz, ret; int cmd_sz, ret;
if (retlen) *retlen = 0;
*retlen = 0;
/* sanity checks */ /* sanity checks */
if (!len) if (!len)