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>

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 1547e2a68279f9c699641f0d0108edc0f557f2f4..8feb5fdcd97bdd543578a7dd93e997724820e351 100644 (file)
--- 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 7dee9709fbfca31ec50edbf3099d9be4ad688dfe..1a7e1d20adf9ee657044935a5bfc43874d585bb7 100644 (file)
--- 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 {