summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2011-08-30 18:45:46 -0700
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:57:44 +0300
commit19fb4341ad7a72e4c996234a1834e52e1f7954ba (patch)
tree4eff2d048c465dbe347d24af91016ea0680dc1e0
parent4a89ff885ff9f64ea62669100766e10e4e257c6e (diff)
mtd: kill old field for `struct mtd_info_user'
The ecctype and eccsize fields have been obsolete for a while. Since they don't have any users, we can kill them and leave padding in their place for now. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
-rw-r--r--drivers/mtd/mtdchar.c4
-rw-r--r--include/mtd/mtd-abi.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 1547e2a6827..8feb5fdcd97 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -672,8 +672,8 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
info.erasesize = mtd->erasesize;
info.writesize = mtd->writesize;
info.oobsize = mtd->oobsize;
- /* The below fields are obsolete */
- info.ecctype = -1;
+ /* The below field is obsolete */
+ info.padding = 0;
if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
return -EFAULT;
break;
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index 7dee9709fbf..1a7e1d20adf 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -129,10 +129,7 @@ struct mtd_info_user {
__u32 erasesize;
__u32 writesize;
__u32 oobsize; /* Amount of OOB data per block (e.g. 16) */
- /* The below two fields are obsolete and broken, do not use them
- * (TODO: remove at some point) */
- __u32 ecctype;
- __u32 eccsize;
+ __u64 padding; /* Old obsolete field; do not use */
};
struct region_info_user {