ppc4xx: Fixed compilation warning in 4xx_enet.c
PATCH 1/1 ppc4xx: Fixed compilation warning in 4xx_enet.c
This patch fixes a compilation warning for some Ethernet PHY-less PPC4xx platforms (440SPE based ones) and a potential compilation error for 440SP platforms (use of undefined 'ethgroup' variable). In the original code and in case of 440SPE platforms, 'ethgroup' is initialized to -1 and never modified. Later in the function, within an #ifdef statement, an 'if statement' executes code only if 'ethgroup' is set to 4, therefore it is harmless to avoid executing the 'if statement' by removing the CONFIG_440SPE from the affected #ifdefs. In case of 440SP platforms with on-board Ethernet PHY, 'ethgroup' is undefined but used (there are not such platforms in the repository yet). All other architectures are not affected by this change.
--- drivers/net/4xx_enet.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/4xx_enet.c +0 -0
@@ -870,7 +870,7 @@ static int ppc_4xx_eth_init (struct eth_device
*dev, bd_t * bis)
defined(CONFIG_405EX)
u32 opbfreq;
sys_info_t sysinfo;
-#if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \
+#if defined(CONFIG_440GX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)@@ -1119,7 +1119,6 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
#if defined(CONFIG_440GX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
- defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)Signature · 1 line
1.6.0.4
PATCH 1/1 ppc4xx: Fixed compilation warning in 4xx_enet.c
Hi Ben,
Quoted 13 lines · On Saturday 11 July 2009 20:56:06 Alessio Centazzo wrote:
This patch fixes a compilation warning for some Ethernet PHY-less PPC4xx platforms (440SPE based ones) and a potential compilation error for 440SP platforms (use of undefined 'ethgroup' variable). In the original code and in case of 440SPE platforms, 'ethgroup' is initialized to -1 and never modified. Later in the function, within an #ifdef statement, an 'if statement' executes code only if 'ethgroup' is set to 4, therefore it is harmless to avoid executing the 'if statement' by removing the
CONFIG_440SPEfrom the affected #ifdefs. In case of 440SP platforms with on-board Ethernet PHY, 'ethgroup' is undefined but used (there are not such platforms in the repository yet). All other architectures are not affected by this change.
Quoted 1 line
Signed-off-by Alessio Centazzo acpatin at yahoo.com
This patch falls into your responsibility now. I have no objections, so:
Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH 1/1 ppc4xx: Fixed compilation warning in 4xx_enet.c
In reply to Alessio CentazzoStefan,
Can I get an ACK from you on this? Sorry if you already did and I missed it.
regards,
Ben
Quoted 42 lines · Alessio Centazzo
This patch fixes a compilation warning for some Ethernet PHY-less PPC4xx platforms (440SPE based ones) and a potential compilation error for 440SP platforms (use of undefined 'ethgroup' variable). In the original code and in case of 440SPE platforms, 'ethgroup' is initialized to -1 and never modified. Later in the function, within an #ifdef statement, an 'if statement' executes code only if 'ethgroup' is set to 4, therefore it is harmless to avoid executing the 'if statement' by removing the
CONFIG_440SPEfrom the affected #ifdefs. In case of 440SP platforms with on-board Ethernet PHY, 'ethgroup' is undefined but used (there are not such platforms in the repository yet). All other architectures are not affected by this change.Signed-off-by Alessio Centazzo acpatin at yahoo.com--- drivers/net/4xx_enet.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)drivers/net/4xx_enet.c +1
-1@@ -870,7 +870,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) defined(CONFIG_405EX)u32 opbfreq;sys_info_t sysinfo; -#if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ +#if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \defined(CONFIG_405EX)drivers/net/4xx_enet.c +0
-1@@ -1119,7 +1119,6 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)#if defined(CONFIG_440GX ) || \ defined(CONFIG_440EPX ) || defined(CONFIG_440GRX ) || \ - defined(CONFIG_440SP ) || defined(CONFIG_440SPE ) || \ defined(CONFIG_460EX ) || defined(CONFIG_460GT ) || \ defined(CONFIG_405EX )
PATCH 1/1 ppc4xx: Fixed compilation warning in 4xx_enet.c
Ben,
Quoted 2 lines · On Tuesday 21 July 2009 07:55:30 Ben Warren wrote:
Can I get an ACK from you on this? Sorry if you already did and I missed it.
I thought that I already ack'ed it. But hey, I have more than one ;)
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH 1/1 ppc4xx: Fixed compilation warning in 4xx_enet.c
Quoted 11 lines · Stefan Roese
Ben,
Quoted 3 lines · On Tuesday 21 July 2009 07:55:30 Ben Warren wrote:
Can I get an ACK from you on this? Sorry if you already did and I missed it.
I thought that I already ack'ed it. But hey, I have more than one ;)
You probably did, but it got lost somewhere in my mountain of e-mails.
thanks,
Ben