mtd/nand/fsl_upm: Replace the dangerous to_fsl_upm_nand macro

[Linux-MTD Mailing List]

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

    mtd/nand/fsl_upm: Replace the dangerous to_fsl_upm_nand 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>
---
 drivers/mtd/nand/fsl_upm.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d721ec0..b4e2ba4 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -48,7 +48,10 @@ struct fsl_upm_nand {
 	uint32_t wait_flags;
 };
 
-#define to_fsl_upm_nand(mtd) container_of(mtd, struct fsl_upm_nand, mtd)
+static inline struct fsl_upm_nand *to_fsl_upm_nand(struct mtd_info *mtdinfo)
+{
+	return container_of(mtdinfo, struct fsl_upm_nand, mtd);
+}
 
 static int fun_chip_ready(struct mtd_info *mtd)
 {