mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Wed May 12 18:59:01 EDT 2010


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=1cd2620ca9332943c9fff84c0c9240982534d840
Commit:     1cd2620ca9332943c9fff84c0c9240982534d840
Parent:     0ae28a35bcb7984838acbf28bfba9c030f8b74f0
Author:     Peter Huewe <peterhuewe at gmx.de>
AuthorDate: Thu May 13 00:06:54 2010 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed May 12 23:24:23 2010 +0100

    mtd/nand/sh_flctl: Move function mtd_to_flctl to fix build failure
    
    This patch fixes a build failure[1] by simply moving the function mtd_to_flctl
    beneath the definition of sh_flctl which it uses.
    
    BF introduced by patch
    'mtd/nand/sh_flctl: Replace the dangerous mtd_to_flctl macro' (67026418)
    
    Signed-off-by: Peter Huewe <peterhuewe at gmx.de>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 include/linux/mtd/sh_flctl.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 178b5c2..9cf4c4c 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -93,11 +93,6 @@
 #define INIT_FL4ECCRESULT_VAL	0x03FF03FF
 #define LOOP_TIMEOUT_MAX	0x00010000
 
-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;
 	struct nand_chip	chip;
@@ -128,4 +123,9 @@ struct sh_flctl_platform_data {
 	unsigned has_hwecc:1;
 };
 
+static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo)
+{
+	return container_of(mtdinfo, struct sh_flctl, mtd);
+}
+
 #endif	/* __SH_FLCTL_H__ */



More information about the linux-mtd-cvs mailing list