* [U-Boot] [PATCH] jffs2, suen3: Fix compiler warning
@ 2010-03-24 6:11 Heiko Schocher
2010-03-24 12:04 ` Wolfgang Denk
0 siblings, 1 reply; 5+ messages in thread
From: Heiko Schocher @ 2010-03-24 6:11 UTC (permalink / raw)
To: u-boot
This patch fixes the following compilerwarning,
if compiling u-boot for the suen3 board:
$ ./MAKEALL suen3
jffs2_1pass.c: In function 'get_fl_mem':
jffs2_1pass.c:399: warning: unused variable 'id'
jffs2_1pass.c: In function 'get_node_mem':
jffs2_1pass.c:423: warning: unused variable 'id'
Signed-off-by: Heiko Schocher <hs@denx.de>
---
fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 93651f5..190d236 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -398,23 +398,26 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf)
{
struct mtdids *id = current_part->dev->id;
+ switch(id->type) {
#if defined(CONFIG_CMD_FLASH)
- if (id->type == MTD_DEV_TYPE_NOR) {
+ case MTD_DEV_TYPE_NOR:
return get_fl_mem_nor(off, size, ext_buf);
- }
+ break;
#endif
-
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
- if (id->type == MTD_DEV_TYPE_NAND)
+ case MTD_DEV_TYPE_NAND:
return get_fl_mem_nand(off, size, ext_buf);
+ break;
#endif
-
#if defined(CONFIG_CMD_ONENAND)
- if (id->type == MTD_DEV_TYPE_ONENAND)
+ case MTD_DEV_TYPE_ONENAND:
return get_fl_mem_onenand(off, size, ext_buf);
+ break;
#endif
-
- printf("get_fl_mem: unknown device type, using raw offset!\n");
+ default:
+ printf("get_fl_mem: unknown device type, \
+ using raw offset!\n");
+ }
return (void*)off;
}
@@ -422,23 +425,27 @@ static inline void *get_node_mem(u32 off, void *ext_buf)
{
struct mtdids *id = current_part->dev->id;
+ switch(id->type) {
#if defined(CONFIG_CMD_FLASH)
- if (id->type == MTD_DEV_TYPE_NOR)
+ case MTD_DEV_TYPE_NOR:
return get_node_mem_nor(off, ext_buf);
+ break;
#endif
-
#if defined(CONFIG_JFFS2_NAND) && \
defined(CONFIG_CMD_NAND)
- if (id->type == MTD_DEV_TYPE_NAND)
+ case MTD_DEV_TYPE_NAND:
return get_node_mem_nand(off, ext_buf);
+ break;
#endif
-
#if defined(CONFIG_CMD_ONENAND)
- if (id->type == MTD_DEV_TYPE_ONENAND)
+ case MTD_DEV_TYPE_ONENAND:
return get_node_mem_onenand(off, ext_buf);
+ break;
#endif
-
- printf("get_node_mem: unknown device type, using raw offset!\n");
+ default:
+ printf("get_node_mem: unknown device type, \
+ using raw offset!\n");
+ }
return (void*)off;
}
--
1.6.2.5
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] jffs2, suen3: Fix compiler warning
2010-03-24 6:11 [U-Boot] [PATCH] jffs2, suen3: Fix compiler warning Heiko Schocher
@ 2010-03-24 12:04 ` Wolfgang Denk
2010-03-24 12:22 ` [U-Boot] [PATCH v2] " Heiko Schocher
0 siblings, 1 reply; 5+ messages in thread
From: Wolfgang Denk @ 2010-03-24 12:04 UTC (permalink / raw)
To: u-boot
Dear Heiko Schocher,
In message <4BA9AD21.6020601@denx.de> you wrote:
>
> $ ./MAKEALL suen3
> jffs2_1pass.c: In function 'get_fl_mem':
> jffs2_1pass.c:399: warning: unused variable 'id'
> jffs2_1pass.c: In function 'get_node_mem':
> jffs2_1pass.c:423: warning: unused variable 'id'
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
> fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++---------------
> 1 files changed, 22 insertions(+), 15 deletions(-)
NAK.
> + default:
> + printf("get_fl_mem: unknown device type, \
> + using raw offset!\n");
> + }
This will not give the intended output. Please fix.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Security is mostly a superstition. It does not exist in nature...
Life is either a daring adventure or nothing." - Helen Keller
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v2] jffs2, suen3: Fix compiler warning
2010-03-24 12:04 ` Wolfgang Denk
@ 2010-03-24 12:22 ` Heiko Schocher
2010-03-29 12:42 ` Tom
2010-03-30 21:20 ` Wolfgang Denk
0 siblings, 2 replies; 5+ messages in thread
From: Heiko Schocher @ 2010-03-24 12:22 UTC (permalink / raw)
To: u-boot
$ ./MAKEALL suen3
jffs2_1pass.c: In function 'get_fl_mem':
jffs2_1pass.c:399: warning: unused variable 'id'
jffs2_1pass.c: In function 'get_node_mem':
jffs2_1pass.c:423: warning: unused variable 'id'
Signed-off-by: Heiko Schocher <hs@denx.de>
---
- changes since v1:
added comment from Wolfgang Denk
fixed output
fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 93651f5..c4f7445 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -398,23 +398,26 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf)
{
struct mtdids *id = current_part->dev->id;
+ switch(id->type) {
#if defined(CONFIG_CMD_FLASH)
- if (id->type == MTD_DEV_TYPE_NOR) {
+ case MTD_DEV_TYPE_NOR:
return get_fl_mem_nor(off, size, ext_buf);
- }
+ break;
#endif
-
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
- if (id->type == MTD_DEV_TYPE_NAND)
+ case MTD_DEV_TYPE_NAND:
return get_fl_mem_nand(off, size, ext_buf);
+ break;
#endif
-
#if defined(CONFIG_CMD_ONENAND)
- if (id->type == MTD_DEV_TYPE_ONENAND)
+ case MTD_DEV_TYPE_ONENAND:
return get_fl_mem_onenand(off, size, ext_buf);
+ break;
#endif
-
- printf("get_fl_mem: unknown device type, using raw offset!\n");
+ default:
+ printf("get_fl_mem: unknown device type, " \
+ "using raw offset!\n");
+ }
return (void*)off;
}
@@ -422,23 +425,27 @@ static inline void *get_node_mem(u32 off, void *ext_buf)
{
struct mtdids *id = current_part->dev->id;
+ switch(id->type) {
#if defined(CONFIG_CMD_FLASH)
- if (id->type == MTD_DEV_TYPE_NOR)
+ case MTD_DEV_TYPE_NOR:
return get_node_mem_nor(off, ext_buf);
+ break;
#endif
-
#if defined(CONFIG_JFFS2_NAND) && \
defined(CONFIG_CMD_NAND)
- if (id->type == MTD_DEV_TYPE_NAND)
+ case MTD_DEV_TYPE_NAND:
return get_node_mem_nand(off, ext_buf);
+ break;
#endif
-
#if defined(CONFIG_CMD_ONENAND)
- if (id->type == MTD_DEV_TYPE_ONENAND)
+ case MTD_DEV_TYPE_ONENAND:
return get_node_mem_onenand(off, ext_buf);
+ break;
#endif
-
- printf("get_node_mem: unknown device type, using raw offset!\n");
+ default:
+ printf("get_fl_mem: unknown device type, " \
+ "using raw offset!\n");
+ }
return (void*)off;
}
--
1.6.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v2] jffs2, suen3: Fix compiler warning
2010-03-24 12:22 ` [U-Boot] [PATCH v2] " Heiko Schocher
@ 2010-03-29 12:42 ` Tom
2010-03-30 21:20 ` Wolfgang Denk
1 sibling, 0 replies; 5+ messages in thread
From: Tom @ 2010-03-29 12:42 UTC (permalink / raw)
To: u-boot
Heiko Schocher wrote:
> $ ./MAKEALL suen3
> jffs2_1pass.c: In function 'get_fl_mem':
> jffs2_1pass.c:399: warning: unused variable 'id'
> jffs2_1pass.c: In function 'get_node_mem':
> jffs2_1pass.c:423: warning: unused variable 'id'
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
This change does silence these warning with no added regressions.
Tested-by: Tom <Tom.Rix@windriver.com>
Tom
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v2] jffs2, suen3: Fix compiler warning
2010-03-24 12:22 ` [U-Boot] [PATCH v2] " Heiko Schocher
2010-03-29 12:42 ` Tom
@ 2010-03-30 21:20 ` Wolfgang Denk
1 sibling, 0 replies; 5+ messages in thread
From: Wolfgang Denk @ 2010-03-30 21:20 UTC (permalink / raw)
To: u-boot
Dear Heiko Schocher,
In message <4BAA041A.3000006@invitel.hu> you wrote:
> $ ./MAKEALL suen3
> jffs2_1pass.c: In function 'get_fl_mem':
> jffs2_1pass.c:399: warning: unused variable 'id'
> jffs2_1pass.c: In function 'get_node_mem':
> jffs2_1pass.c:423: warning: unused variable 'id'
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
> - changes since v1:
> added comment from Wolfgang Denk
> fixed output
>
> fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++---------------
> 1 files changed, 22 insertions(+), 15 deletions(-)
Applied. Sorry I missed this so long.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Who is the oldest inhabitant of this village?"
"We haven't got one; we had one, but he died three weeks ago."
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-03-30 21:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-24 6:11 [U-Boot] [PATCH] jffs2, suen3: Fix compiler warning Heiko Schocher
2010-03-24 12:04 ` Wolfgang Denk
2010-03-24 12:22 ` [U-Boot] [PATCH v2] " Heiko Schocher
2010-03-29 12:42 ` Tom
2010-03-30 21:20 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.