Commit 4ea1cabb authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: introduce mtd_read_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 855e5d8c

drivers/mtd/mtdchar.c

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count, 
						     &retlen, kbuf);

			break;

		case MTD_FILE_MODE_OTP_USER:

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

			ret = mtd_read_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
@@ -152,8 +152,7 @@ static int part_read_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->read_user_prot_reg(part->master, from,

					len, retlen, buf);

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

}



static int part_get_user_prot_info(struct mtd_info *mtd,

include/linux/mtd/mtd.h

+9 −1
Original line number Diff line number Diff line
@@ -198,13 +198,14 @@ struct mtd_info { 
				   size_t len, size_t *retlen, u_char *buf);

	int (*get_user_prot_info) (struct mtd_info *mtd, struct otp_info *buf,

				   size_t len);

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

				   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 (*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 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);
@@ -353,6 +354,13 @@ static inline int mtd_get_user_prot_info(struct mtd_info *mtd, 
	return mtd->get_user_prot_info(mtd, buf, len);

}



static inline int mtd_read_user_prot_reg(struct mtd_info *mtd, loff_t from,

					 size_t len, size_t *retlen,

					 u_char *buf)

{

	return mtd->read_user_prot_reg(mtd, from, len, retlen, buf);

}



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

{

	return dev ? dev_get_drvdata(dev) : NULL;