Commit 855e5d8c authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: introduce mtd_get_user_prot_info interface 



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

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -930,7 +930,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) 
			break;

		case MTD_FILE_MODE_OTP_USER:

			if (mtd->get_user_prot_info)

				ret = mtd->get_user_prot_info(mtd, buf, 4096);

				ret = mtd_get_user_prot_info(mtd, buf, 4096);

			break;

		default:

			break;

drivers/mtd/mtdpart.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int part_get_user_prot_info(struct mtd_info *mtd, 
		struct otp_info *buf, size_t len)

{

	struct mtd_part *part = PART(mtd);

	return part->master->get_user_prot_info(part->master, buf, len);

	return mtd_get_user_prot_info(part->master, buf, len);

}



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

include/linux/mtd/mtd.h

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

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

				   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);



	/* Backing device capabilities for this device

	 * - provides mmap capabilities

	 */

	struct backing_dev_info *backing_dev_info;



	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);

	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);
@@ -345,6 +346,13 @@ static inline int mtd_read_fact_prot_reg(struct mtd_info *mtd, loff_t from, 
	return mtd->read_fact_prot_reg(mtd, from, len, retlen, buf);

}



static inline int mtd_get_user_prot_info(struct mtd_info *mtd,

					 struct otp_info *buf,

					 size_t len)

{

	return mtd->get_user_prot_info(mtd, buf, len);

}



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

{

	return dev ? dev_get_drvdata(dev) : NULL;