mtd: introduce mtd_get_user_prot_info interface

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 6afb05469bbd8db2735566a1c9c2e084cea19f2d..002a8b5428cc2631b44c5116acbeb72faead8b83 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -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;

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 4f2c9137cd499b07742ad596a8f967d88aef1d13..bf1ab56afb8ea54dbb3876bc660834e72c590201 100644 (file)
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -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,

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index d77a7f83270f3c7daafbd395fabc16c79601c9f3..ff0a3a18f397a20b1c582bc554fe0be3704f59b3 100644 (file)
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -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;