Commit 482b43ad authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: introduce mtd_write_user_prot_reg interface 



Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4ea1cabb

drivers/mtd/mtdchar.c

+2 −1
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t c 
				ret = -EOPNOTSUPP;

				break;

			}

			ret = mtd->write_user_prot_reg(mtd, *ppos, len, &retlen, kbuf);

			ret = mtd_write_user_prot_reg(mtd, *ppos, len,

						      &retlen, kbuf);

			break;



		case MTD_FILE_MODE_RAW:

drivers/mtd/mtdpart.c

+1 −2
Original line number Diff line number Diff line
@@ -222,8 +222,7 @@ static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from, 
		size_t len, size_t *retlen, u_char *buf)

{

	struct mtd_part *part = PART(mtd);

	return part->master->write_user_prot_reg(part->master, from,

					len, retlen, buf);

	return mtd_write_user_prot_reg(part->master, from, len, retlen, buf);

}



static int part_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,

include/linux/mtd/mtd.h

+9 −1
Original line number Diff line number Diff line
@@ -200,13 +200,14 @@ struct mtd_info { 
				   size_t len);

	int (*read_user_prot_reg) (struct mtd_info *mtd, loff_t from,

				   size_t len, size_t *retlen, u_char *buf);

	int (*write_user_prot_reg) (struct mtd_info *mtd, loff_t to, size_t len,

				    size_t *retlen, u_char *buf);



	/* Backing device capabilities for this device

	 * - provides mmap capabilities

	 */

	struct backing_dev_info *backing_dev_info;



	int (*write_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);

	int (*lock_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len);



	/* kvec-based read/write methods.
@@ -361,6 +362,13 @@ static inline int mtd_read_user_prot_reg(struct mtd_info *mtd, loff_t from, 
	return mtd->read_user_prot_reg(mtd, from, len, retlen, buf);

}



static inline int mtd_write_user_prot_reg(struct mtd_info *mtd, loff_t to,

					  size_t len, size_t *retlen,

					  u_char *buf)

{

	return mtd->write_user_prot_reg(mtd, to, len, retlen, buf);

}



static inline struct mtd_info *dev_to_mtd(struct device *dev)

{

	return dev ? dev_get_drvdata(dev) : NULL;