Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8546ac4f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by David Woodhouse
Browse files

[MTD] Remove the only useless readv implementation 



Removing readv from struct mtd_info broke block2mtd. Remove the
reference and the useless default implementation.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f5bbdacc

drivers/mtd/devices/block2mtd.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mtd/mtdcore.c

+0 −32
Original line number Diff line number Diff line
@@ -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