net: designware: fix unused warning when CONFIG_DW_AUTONEG is enabled

PATCH New Mike Frysinger 3 participants 6 messages Jun 2, 2011 – Jul 25, 2011 Network drivers

Share & tools

Mike Frysinger

author

2011-06-02 15:19 UTC #0 lore raw

PATCH 1/1 net: designware: fix unused warning when CONFIG_DW_AUTONEG is enabled

The ctrl variable is only used when autoneg support is disabled, so only declare it under those conditions to avoid an unused variable warning.

Signed-off-by Mike Frysinger <[email protected]>

---
 drivers/net/designware.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

drivers/net/designware.c +3 -1

index 3f5eeb7..96f20d1 100644
@@ -368,11 +368,13 @@ static int configure_phy(struct eth_device *dev)
 {
 	struct dw_eth_dev *priv = dev->priv;
 	int phy_addr;
-	u16 bmcr, ctrl;
+	u16 bmcr;
 #if defined(CONFIG_DW_AUTONEG)
 	u16 bmsr;
 	u32 timeout;
 	u16 anlpar, btsr;
+#else
+	u16 ctrl;
 #endif
 
 #if defined(CONFIG_DW_SEARCH_PHY)

Signature · 1 line

1.7.5.3

Mike Frysinger

author

2011-06-02 15:19 UTC #1 lore raw

PATCH 1/1 net: designware: fix uninitialized phy_addr usage

When CONFIG_DW_SEARCH_PHY is disabled, the local phy_addr variable never gets initialized causes random behavior at runtime and a gcc warning. So set it by default to the stored phy address.

Signed-off-by Mike Frysinger <[email protected]>

---
 drivers/net/designware.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

drivers/net/designware.c +2 -0

index 96f20d1..bfa4384 100644
@@ -383,6 +383,8 @@ static int configure_phy(struct eth_device *dev)
 		priv->address = phy_addr;
 	else
 		return -1;
+#else
+	phy_addr = priv->address;
 #endif
 	if (dw_reset_phy(dev) < 0)
 		return -1;

Signature · 1 line

1.7.5.3

Vipin Kumar

2011-06-06 04:21 UTC #2 lore raw

PATCH 1/1 net: designware: fix uninitialized phy_addr usage

Quoted 14 lines · Mike Frysinger

When CONFIG_DW_SEARCH_PHY is disabled, the local phy_addr variable never gets initialized causes random behavior at runtime and a gcc warning. So set it by default to the stored phy address.
Signed-off-by Mike Frysinger <[email protected]>
---
 drivers/net/designware.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/designware.c +0 -0
index 96f20d1..bfa4384 100644

drivers/net/designware.c static int configure_phy(struct eth_device *dev) · line 390

Quoted 8 lines

drivers/net/designware.c +2 -0

@@ -383,6 +383,8 @@ static int configure_phy(struct eth_device *dev)
 		priv->address = phy_addr;
 	else
 		return -1;
+#else
+	phy_addr = priv->address;
 #endif
 	if (dw_reset_phy(dev) < 0)
 		return -1;

Reviewed-by Vipin Kumar <[email protected]>

Thanks Mike

Regards
Vipin

Wolfgang Denk

2011-07-25 20:21 UTC #3 lore raw

PATCH 1/1 net: designware: fix uninitialized phy_addr usage

In reply to Mike Frysinger

Dear Mike Frysinger,

Quoted 8 lines · In message <[email protected]> you wrote:

When CONFIG_DW_SEARCH_PHY is disabled, the local phy_addr variable never gets initialized causes random behavior at runtime and a gcc warning. So set it by default to the stored phy address.
Signed-off-by Mike Frysinger <[email protected]>
---
 drivers/net/designware.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Applied (with minimal changes to the commit message which is missing a 'which" or so), thanks.

Best regards,

Wolfgang Denk

Signature · 8 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
I see that Microsoft's campaign  to  destroy  all  knowledge  of  any
operating   environment   but  its  own  environment-of-the-year  has
succeeded in creating a generation of users who don't understand  the
concept of a shell...
            -- L. Peter Deutsch in <[email protected]>

Vipin Kumar

2011-06-06 04:21 UTC #4 lore raw

PATCH 1/1 net: designware: fix unused warning when CONFIG_DW_AUTONEG is enabled

In reply to Mike Frysinger

Quoted 17 lines · Mike Frysinger

The ctrl variable is only used when autoneg support is disabled, so only declare it under those conditions to avoid an unused variable warning.
Signed-off-by Mike Frysinger <[email protected]>
---
 drivers/net/designware.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/net/designware.c +0 -1
index 3f5eeb7..96f20d1 100644
@@ -368,11 +368,13 @@ static int configure_phy(struct eth_device *dev)
 {
 	struct dw_eth_dev *priv = dev->priv;
 	int phy_addr;
-	u16 bmcr, ctrl;

drivers/net/designware.c static int configure_phy(struct eth_device *dev) · line 380

Quoted 10 lines

drivers/net/designware.c +3 -0

+	u16 bmcr;
 #if defined(CONFIG_DW_AUTONEG)
 	u16 bmsr;
 	u32 timeout;
 	u16 anlpar, btsr;
+#else
+	u16 ctrl;
 #endif
 
 #if defined(CONFIG_DW_SEARCH_PHY)

Reviewed-by Vipin Kumar <[email protected]>

Regards
Vipin

Wolfgang Denk

Applied

2011-07-25 20:20 UTC #5 lore raw

PATCH 1/1 net: designware: fix unused warning when CONFIG_DW_AUTONEG is enabled

In reply to Mike Frysinger

Dear Mike Frysinger,

Quoted 7 lines · In message <[email protected]> you wrote:

The ctrl variable is only used when autoneg support is disabled, so only declare it under those conditions to avoid an unused variable warning.
Signed-off-by Mike Frysinger <[email protected]>
---
 drivers/net/designware.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 8 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
"No proper program contains  an  indication  which  as  an  operator-
applied  occurrence  identifies an operator-defining occurrence which
as an indication-applied occurrence identifies an indication-defining
occurrence different from the one identified by the given  indication
as an indication-applied occurrence."               - ALGOL 68 Report