[U-Boot] [PATCH] JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.

[U-Boot] [PATCH] JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.

[Scott Wood]

Reported-by: Alessandro Rubini <rubini-list@gnudd.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
---
Applied to u-boot-nand-flash

 fs/jffs2/jffs2_1pass.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 0177268..920d2fd 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -449,20 +449,18 @@ static inline void *get_node_mem(u32 off)
 
 static inline void put_fl_mem(void *buf)
 {
-#if defined(CONFIG_JFFS2_NAND) && \
-    defined(CONFIG_CMD_NAND)
 	struct mtdids *id = current_part->dev->id;
 
-	if (id->type == MTD_DEV_TYPE_NAND)
+	switch (id->type) {
+#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
+	case MTD_DEV_TYPE_NAND:
 		return put_fl_mem_nand(buf);
 #endif
-
 #if defined(CONFIG_CMD_ONENAND)
-	struct mtdids *id = current_part->dev->id;
-
-	if (id->type == MTD_DEV_TYPE_ONENAND)
+	case MTD_DEV_TYPE_ONENAND:
 		return put_fl_mem_onenand(buf);
 #endif
+	}
 }
 
 /* Compression names */
-- 
1.5.6.rc1.6.gc53ad

[U-Boot] [PATCH] JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.

[Alessandro Rubini]

> Eliminate compiler error when both NAND and OneNAND are enabled.

Thanks. I've done it differently this morning (without warning), but
yours is better.

I adopted your suggestion and submitted the patch to nand.h, it works
for me (although I'm still missing the two drivers for the board).

> Reported-by:

I didn't find a policy for "Reported-by:" or other tags besides
Signed-off-by: and Acked-by: .  Mine are surely wronh in the patch I sent.
Any pointer for us to get a culture?

Thanks
/alessandro

[U-Boot] [PATCH] JFFS2: Eliminate compiler error when both NAND and OneNAND are enabled.

[Scott Wood]

Alessandro Rubini wrote:
>> Reported-by:
> 
> I didn't find a policy for "Reported-by:" or other tags besides
> Signed-off-by: and Acked-by: .  Mine are surely wronh in the patch I sent.
> Any pointer for us to get a culture?

I don't think it's anything as official as those other two; just a way 
of providing the information concisely (similar to Tested-by).

-Scott