diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2011-12-29 10:39:20 +0200 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-01-09 18:26:17 +0000 |
| commit | 27c151a5e52efaa46d0938984f2ef591bdcb6d5b (patch) | |
| tree | 67866c01422a4f0c99192b0bc2db8f1968cd1f5b | |
| parent | b6de3d6cb63427178c4f1df88b81d1ceee637e6f (diff) | |
| download | linux-3.10-27c151a5e52efaa46d0938984f2ef591bdcb6d5b.tar.gz linux-3.10-27c151a5e52efaa46d0938984f2ef591bdcb6d5b.tar.bz2 linux-3.10-27c151a5e52efaa46d0938984f2ef591bdcb6d5b.zip | |
mtd: mtd->write_user_prot_reg directly
Instead, just call 'mtd_write_user_prot_reg()' and check the '-EOPNOTSUPP' return
code.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | drivers/mtd/mtdchar.c | 4 | ||||
| -rw-r--r-- | include/linux/mtd/mtd.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 4e8e5fbc1e1..25bbbc3aa66 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -310,10 +310,6 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t c ret = -EROFS; break; case MTD_FILE_MODE_OTP_USER: - if (!mtd->write_user_prot_reg) { - ret = -EOPNOTSUPP; - break; - } ret = mtd_write_user_prot_reg(mtd, *ppos, len, &retlen, kbuf); break; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index e488cf91091..7cd56d2b941 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -381,6 +381,8 @@ static inline int mtd_write_user_prot_reg(struct mtd_info *mtd, loff_t to, u_char *buf) { *retlen = 0; + if (!mtd->write_user_prot_reg) + return -EOPNOTSUPP; return mtd->write_user_prot_reg(mtd, to, len, retlen, buf); } |