mtd/nand/sh_flctl: Replace the dangerous mtd_to_flctl macro

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=67026418f534045525a7c39f506006cd7fbd197f
Commit:     67026418f534045525a7c39f506006cd7fbd197f
Parent:     b92b5c41a05b69f56e3d5e92dce3dbb5f5f5cf81
Author:     Ferenc Wagner <wferi at niif.hu>
AuthorDate: Tue Mar 23 18:09:09 2010 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon May 10 14:22:19 2010 +0100

    mtd/nand/sh_flctl: Replace the dangerous mtd_to_flctl macro
    
    The original macro worked only when applied to variables named 'mtd'.
    While this could have been fixed by simply renaming the macro argument,
    a more type-safe replacement is preferred.
    
    Signed-off-by: Ferenc Wagner <wferi at niif.hu>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 include/linux/mtd/sh_flctl.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index ab77609..178b5c2 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -93,7 +93,10 @@
 #define INIT_FL4ECCRESULT_VAL	0x03FF03FF
 #define LOOP_TIMEOUT_MAX	0x00010000
 
-#define mtd_to_flctl(mtd)	container_of(mtd, struct sh_flctl, mtd)
+static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo)
+{
+	return container_of(mtdinfo, struct sh_flctl, mtd);
+}
 
 struct sh_flctl {
 	struct mtd_info		mtd;