diff mbox

[11/12] mtd: kill old field for `struct mtd_info_user'

Message ID 1314755147-17756-12-git-send-email-computersforpeace@gmail.com
State Accepted
Commit 19fb4341ad7a72e4c996234a1834e52e1f7954ba
Headers show

Commit Message

Brian Norris Aug. 31, 2011, 1:45 a.m. UTC 
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>
---
 drivers/mtd/mtdchar.c |    4 ++--
 include/mtd/mtd-abi.h |    5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

Comments

Artem Bityutskiy Sept. 11, 2011, 12:35 p.m. UTC | #1 
On Tue, 2011-08-30 at 18:45 -0700, Brian Norris wrote:
> 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.

Actually not for now, but forever :-) Pushed to my tree, thanks!
diff mbox

Patch

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 1547e2a..8feb5fd 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 d54ccf3..8138767 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 {