Patchwork mtd: Move function mtd_to_flctl to fix build failure

login
register
mail settings
Submitter Peter Hüwe
Date May 12, 2010, 10:06 p.m.
Message ID <201005130006.54616.PeterHuewe@gmx.de>
Download mbox | patch
Permalink /patch/52409/
State Accepted
Commit 1cd2620ca9332943c9fff84c0c9240982534d840
Headers show

Comments

Peter Hüwe - May 12, 2010, 10:06 p.m.
From: Peter Huewe <peterhuewe@gmx.de>

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@gmx.de>
---
KernelVersion: linux-next of 20100512
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2601986/

 include/linux/mtd/sh_flctl.h |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

Patch

diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 178b5c2..d7b686a 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__ */