jffs2, suen3: Fix compiler warning
PATCH 1/1 jffs2, suen3: Fix compiler warning
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'
--- fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-)
fs/jffs2/jffs2_1pass.c +22 -15
@@ -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; }
Signature · 5 lines
1.6.2.5 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Wolfgang Denk
NAKPATCH 1/1 jffs2, suen3: Fix compiler warning
Dear Heiko Schocher,
Quoted 11 lines · In message <[email protected]> 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 <[email protected]>--- fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-)
NAK.
fs/jffs2/jffs2_1pass.c static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) · line 420
Quoted 4 lines
fs/jffs2/jffs2_1pass.c +4
-0+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
Signature · 5 lines
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
PATCH v2 1/1 jffs2, suen3: Fix compiler warning
$ ./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'
---
- changes since v1:
added comment from Wolfgang Denk
fixed output
fs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-)
fs/jffs2/jffs2_1pass.c +22 -15
@@ -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; }
Signature · 1 line
1.6.2.5
PATCH v2 1/1 jffs2, suen3: Fix compiler warning
Quoted 7 lines · Heiko Schocher
$ ./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 <[email protected]>
This change does silence these warning with no added regressions.
Tom
Wolfgang Denk
AppliedPATCH v2 1/1 jffs2, suen3: Fix compiler warning
In reply to Heiko SchocherDear Heiko Schocher,
Quoted 6 lines · In message <[email protected]> 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'
Quoted 8 lines
Signed-off-by Heiko Schocher <[email protected]>---
- changes since v1:
added comment from Wolfgang Denk
fixed outputfs/jffs2/jffs2_1pass.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-)
Applied. Sorry I missed this so long.
Best regards,
Wolfgang Denk
Signature · 5 lines
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."