lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mtd: introduce mtd_read_user_prot_reg interface

Browse Source 
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Artem Bityutskiy
2011-12-23 18:47:59 +02:00
committed by David Woodhouse
parent 855e5d8cfe
commit 4ea1cabb92
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/mtdchar.c
View File

@@ -217,7 +217,8 @@ static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count,
&retlen, kbuf); &retlen, kbuf);
break; break;
case MTD_FILE_MODE_OTP_USER: 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; break;
case MTD_FILE_MODE_RAW: case MTD_FILE_MODE_RAW:
{ {

3
drivers/mtd/mtdpart.c
View File

@@ -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) size_t len, size_t *retlen, u_char *buf)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
return part->master->read_user_prot_reg(part->master, from, return mtd_read_user_prot_reg(part->master, from, len, retlen, buf);
len, retlen, buf);
} }
static int part_get_user_prot_info(struct mtd_info *mtd, static int part_get_user_prot_info(struct mtd_info *mtd,

10
include/linux/mtd/mtd.h
View File

@@ -198,13 +198,14 @@ struct mtd_info {
size_t len, size_t *retlen, u_char *buf); size_t len, size_t *retlen, u_char *buf);
int (*get_user_prot_info) (struct mtd_info *mtd, struct otp_info *buf, int (*get_user_prot_info) (struct mtd_info *mtd, struct otp_info *buf,
size_t len); 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 /* 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 (*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 (*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); 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); 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) 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;