Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27887
b: refs/heads/master
c: 8546ac4
h: refs/heads/master
i:
  27885: b517821
  27883: a51bbc4
  27879: cc159b1
  27871: fd4cedf
v: v3
  • Loading branch information
Thomas Gleixner authored and David Woodhouse committed May 25, 2006
1 parent fc3336f commit ce37024
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d
refs/heads/master: 8546ac4f84b252fff078fab1a992c70504147914
1 change: 0 additions & 1 deletion trunk/drivers/mtd/devices/block2mtd.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
dev->mtd.writev = default_mtd_writev;
dev->mtd.sync = block2mtd_sync;
dev->mtd.read = block2mtd_read;
dev->mtd.readv = default_mtd_readv;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;

Expand Down
32 changes: 0 additions & 32 deletions trunk/drivers/mtd/mtdcore.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,45 +254,13 @@ int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
return ret;
}


/* default_mtd_readv - default mtd readv method for MTD devices that dont
* implement their own
*/

int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs,
unsigned long count, loff_t from, size_t *retlen)
{
unsigned long i;
size_t totlen = 0, thislen;
int ret = 0;

if(!mtd->read) {
ret = -EIO;
} else {
for (i=0; i<count; i++) {
if (!vecs[i].iov_len)
continue;
ret = mtd->read(mtd, from, vecs[i].iov_len, &thislen, vecs[i].iov_base);
totlen += thislen;
if (ret || thislen != vecs[i].iov_len)
break;
from += vecs[i].iov_len;
}
}
if (retlen)
*retlen = totlen;
return ret;
}


EXPORT_SYMBOL(add_mtd_device);
EXPORT_SYMBOL(del_mtd_device);
EXPORT_SYMBOL(get_mtd_device);
EXPORT_SYMBOL(put_mtd_device);
EXPORT_SYMBOL(register_mtd_user);
EXPORT_SYMBOL(unregister_mtd_user);
EXPORT_SYMBOL(default_mtd_writev);
EXPORT_SYMBOL(default_mtd_readv);

#ifdef CONFIG_PROC_FS

Expand Down

0 comments on commit ce37024

Please sign in to comment.