[U-Boot-Users] [PATCH] net: smc911x: Fix can not compile smc911x
When enable CONFIG_DRIVER_SMC911X_16_BIT in smc911x, can not compile it. I revised it from "elif" preprocessor to "elif defined".
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- drivers/net/smc911x.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 7555cb9..a2d3cb2 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -33,7 +33,7 @@ CONFIG_DRIVER_SMC911X_16_BIT shall be set" #endif
-#ifdef CONFIG_DRIVER_SMC911X_32_BIT +#if defined (CONFIG_DRIVER_SMC911X_32_BIT) static inline u32 reg_read(u32 addr) { return *(volatile u32*)addr; @@ -42,7 +42,7 @@ static inline void reg_write(u32 addr, u32 val) { *(volatile u32*)addr = val; } -#elif CONFIG_DRIVER_SMC911X_16_BIT +#elif defined (CONFIG_DRIVER_SMC911X_16_BIT) static inline u32 reg_read(u32 addr) { volatile u16 *addr_16 = (u16 *)addr;
Hi Nobuhiro,
Nobuhiro Iwamatsu schrieb:
When enable CONFIG_DRIVER_SMC911X_16_BIT in smc911x, can not compile it. I revised it from "elif" preprocessor to "elif defined".
You are right. It depends on if one writes #define NAME or #define NAME 1
"#elif" and "#elif defined" behave different then. Probably, I only tested with the "number"-version.
Thank you for catching this.
Best Regards, Jens
Nobuhiro,
Nice catch! Thanks.
Wolfgang/Detlev,
Please pull directly.
regards, Ben
Nobuhiro Iwamatsu wrote:
When enable CONFIG_DRIVER_SMC911X_16_BIT in smc911x, can not compile it. I revised it from "elif" preprocessor to "elif defined".
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org
Acked-by: Ben Warren biggerbadderben@gmail.com
drivers/net/smc911x.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 7555cb9..a2d3cb2 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -33,7 +33,7 @@ CONFIG_DRIVER_SMC911X_16_BIT shall be set" #endif
-#ifdef CONFIG_DRIVER_SMC911X_32_BIT +#if defined (CONFIG_DRIVER_SMC911X_32_BIT) static inline u32 reg_read(u32 addr) { return *(volatile u32*)addr; @@ -42,7 +42,7 @@ static inline void reg_write(u32 addr, u32 val) { *(volatile u32*)addr = val; } -#elif CONFIG_DRIVER_SMC911X_16_BIT +#elif defined (CONFIG_DRIVER_SMC911X_16_BIT) static inline u32 reg_read(u32 addr) { volatile u16 *addr_16 = (u16 *)addr;
In message 48691714.80004@gmail.com you wrote:
Nobuhiro,
Nice catch! Thanks.
Wolfgang/Detlev,
Please pull directly.
Done.
Best regards,
Wolfgang Denk
In message 29ab51dc0806300145n5d5dbbcdq7a11e3780b71840f@mail.gmail.com you wrote:
When enable CONFIG_DRIVER_SMC911X_16_BIT in smc911x, can not compile it. I revised it from "elif" preprocessor to "elif defined".
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org
drivers/net/smc911x.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (4)
-
Ben Warren -
Jens Gehrlein -
Nobuhiro Iwamatsu -
Wolfgang Denk