Jelajahi Sumber

mtd: introduce mtd_lock_user_prot_reg interface

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Artem Bityutskiy 13 tahun lalu
induk
melakukan
4403dbfb45
3 mengubah file dengan 10 tambahan dan 4 penghapusan
  1. 1 1
      drivers/mtd/mtdchar.c
  2. 1 1
      drivers/mtd/mtdpart.c
  3. 8 2
      include/linux/mtd/mtd.h

+ 1 - 1
drivers/mtd/mtdchar.c

@@ -960,7 +960,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
 			return -EFAULT;
 			return -EFAULT;
 		if (!mtd->lock_user_prot_reg)
 		if (!mtd->lock_user_prot_reg)
 			return -EOPNOTSUPP;
 			return -EOPNOTSUPP;
-		ret = mtd->lock_user_prot_reg(mtd, oinfo.start, oinfo.length);
+		ret = mtd_lock_user_prot_reg(mtd, oinfo.start, oinfo.length);
 		break;
 		break;
 	}
 	}
 #endif
 #endif

+ 1 - 1
drivers/mtd/mtdpart.c

@@ -229,7 +229,7 @@ static int part_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
 		size_t len)
 		size_t len)
 {
 {
 	struct mtd_part *part = PART(mtd);
 	struct mtd_part *part = PART(mtd);
-	return part->master->lock_user_prot_reg(part->master, from, len);
+	return mtd_lock_user_prot_reg(part->master, from, len);
 }
 }
 
 
 static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,
 static int part_writev(struct mtd_info *mtd, const struct kvec *vecs,

+ 8 - 2
include/linux/mtd/mtd.h

@@ -202,14 +202,14 @@ struct mtd_info {
 				   size_t len, size_t *retlen, u_char *buf);
 				   size_t len, size_t *retlen, u_char *buf);
 	int (*write_user_prot_reg) (struct mtd_info *mtd, loff_t to, size_t len,
 	int (*write_user_prot_reg) (struct mtd_info *mtd, loff_t to, size_t len,
 				    size_t *retlen, u_char *buf);
 				    size_t *retlen, u_char *buf);
+	int (*lock_user_prot_reg) (struct mtd_info *mtd, loff_t from,
+				   size_t len);
 
 
 	/* Backing device capabilities for this device
 	/* Backing device capabilities for this device
 	 * - provides mmap capabilities
 	 * - provides mmap capabilities
 	 */
 	 */
 	struct backing_dev_info *backing_dev_info;
 	struct backing_dev_info *backing_dev_info;
 
 
-	int (*lock_user_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len);
-
 	/* kvec-based read/write methods.
 	/* kvec-based read/write methods.
 	   NB: The 'count' parameter is the number of _vectors_, each of
 	   NB: The 'count' parameter is the number of _vectors_, each of
 	   which contains an (ofs, len) tuple.
 	   which contains an (ofs, len) tuple.
@@ -369,6 +369,12 @@ static inline int mtd_write_user_prot_reg(struct mtd_info *mtd, loff_t to,
 	return mtd->write_user_prot_reg(mtd, to, len, retlen, buf);
 	return mtd->write_user_prot_reg(mtd, to, len, retlen, buf);
 }
 }
 
 
+static inline int mtd_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
+					 size_t len)
+{
+	return mtd->lock_user_prot_reg(mtd, from, len);
+}
+
 static inline struct mtd_info *dev_to_mtd(struct device *dev)
 static inline struct mtd_info *dev_to_mtd(struct device *dev)
 {
 {
 	return dev ? dev_get_drvdata(dev) : NULL;
 	return dev ? dev_get_drvdata(dev) : NULL;