mtd: introduce mtd_write_user_prot_reg 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 6aa3fb4a0292aa853d816dd86a125a2a26355bee..d8881707ca60b08ffa66cd7d6e26cc15dd173749 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -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:

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

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