From ce3702463f3ad79307ff7f95167c9bf2bc949d2b Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@cruncher.tec.linutronix.de>
Date: Thu, 25 May 2006 13:38:45 +0200
Subject: [PATCH] --- yaml --- r: 27887 b: refs/heads/master c:
 8546ac4f84b252fff078fab1a992c70504147914 h: refs/heads/master i:   27885:
 b5178219575c3d595f5b75f29b288c56e77a4626   27883:
 a51bbc45920f50f7d8271a7c25bbbd9436a150eb   27879:
 cc159b1fea5f805f5658ec9d91d99f808a34d938   27871:
 fd4cedf4ac72e68d7d39b5ad10893be8642c208e v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/mtd/devices/block2mtd.c |  1 -
 trunk/drivers/mtd/mtdcore.c           | 32 ---------------------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/[refs] b/[refs]
index 8b6e91c6f6ed..48396962c77b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d
+refs/heads/master: 8546ac4f84b252fff078fab1a992c70504147914
diff --git a/trunk/drivers/mtd/devices/block2mtd.c b/trunk/drivers/mtd/devices/block2mtd.c
index 8ca04f4e03f0..0d98c223c5fc 100644
--- a/trunk/drivers/mtd/devices/block2mtd.c
+++ b/trunk/drivers/mtd/devices/block2mtd.c
@@ -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;
 
diff --git a/trunk/drivers/mtd/mtdcore.c b/trunk/drivers/mtd/mtdcore.c
index 9905870f56e5..49bc9fdcb88b 100644
--- a/trunk/drivers/mtd/mtdcore.c
+++ b/trunk/drivers/mtd/mtdcore.c
@@ -254,37 +254,6 @@ 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);
@@ -292,7 +261,6 @@ 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