iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: clean-up the default_mtd_writev function

Browse Source 
1. Teach 'mtd_write()' function to return '-EROFS' if the write method
   is undefined, and remove the corresponding check from
   'default_mtd_writev()'.
2. Do not test 'retlen' for NULL - it cannot be NULL.
3. Few minor coding stile clean-ups.
4. Add a kerneldoc comment

Additionally, minor fixes to the kerneldoc comments of the neighbor function.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Artem Bityutskiy 2011-12-30 15:57:25 +02:00 committed by David Woodhouse
parent 4ccf2f1349
commit 52b020317f
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/mtd/mtdcore.c
View File

@ -683,10 +683,17 @@ void __put_mtd_device(struct mtd_info *mtd)
module_put(mtd->owner); module_put(mtd->owner);
} }
/* default_mtd_writev - default mtd writev method for MTD devices that /*
* don't implement their own * default_mtd_writev - the default writev method
* @mtd: mtd device description object pointer
* @vecs: the vectors to write
* @count: count of vectors in @vecs
* @to: the MTD device offset to write to
* @retlen: on exit contains the count of bytes written to the MTD device.
*
* This function returns zero in case of success and a negative error code in
* case of failure.
*/ */
int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs, int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen) unsigned long count, loff_t to, size_t *retlen)
{ {
@ -694,28 +701,24 @@ int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
size_t totlen = 0, thislen; size_t totlen = 0, thislen;
int ret = 0; int ret = 0;
if(!mtd->write) { for (i = 0; i < count; i++) {
ret = -EROFS; if (!vecs[i].iov_len)
} else { continue;
for (i=0; i<count; i++) { ret = mtd_write(mtd, to, vecs[i].iov_len, &thislen,
if (!vecs[i].iov_len) vecs[i].iov_base);
continue; totlen += thislen;
ret = mtd_write(mtd, to, vecs[i].iov_len, &thislen, if (ret || thislen != vecs[i].iov_len)
vecs[i].iov_base); break;
totlen += thislen; to += vecs[i].iov_len;
if (ret || thislen != vecs[i].iov_len)
break;
to += vecs[i].iov_len;
}
} }
if (retlen) *retlen = totlen;
*retlen = totlen;
return ret; return ret;
} }
/** /**
* mtd_kmalloc_up_to - allocate a contiguous buffer up to the specified size * mtd_kmalloc_up_to - allocate a contiguous buffer up to the specified size
* @size: A pointer to the ideal or maximum size of the allocation. Points * @mtd: mtd device description object pointer
* @size: a pointer to the ideal or maximum size of the allocation, points
* to the actual allocation size on success. * to the actual allocation size on success.
* *
* This routine attempts to allocate a contiguous kernel buffer up to * This routine attempts to allocate a contiguous kernel buffer up to

2
include/linux/mtd/mtd.h
View File

@ -291,6 +291,8 @@ static inline int mtd_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
*retlen = 0; *retlen = 0;
if (!mtd->write)
return -EROFS;
return mtd->write(mtd, to, len, retlen, buf); return mtd->write(mtd, to, len, retlen, buf);
} }