[U-Boot] [PATCH] 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 vapier@gentoo.org --- drivers/net/designware.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 3f5eeb7..96f20d1 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -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)
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 vapier@gentoo.org --- drivers/net/designware.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 96f20d1..bfa4384 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -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;
On 6/2/2011 8:49 PM, Mike Frysinger 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 vapier@gentoo.org
drivers/net/designware.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 96f20d1..bfa4384 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -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 vipin.kumar@st.com Thanks Mike
Regards Vipin
Dear Mike Frysinger,
In message 1307027978-13418-2-git-send-email-vapier@gentoo.org 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 vapier@gentoo.org
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
On 6/2/2011 8:49 PM, Mike Frysinger 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 vapier@gentoo.org
drivers/net/designware.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 3f5eeb7..96f20d1 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -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)
Reviewed-by: Vipin Kumar vipin.kumar@st.com
Regards Vipin
Dear Mike Frysinger,
In message 1307027978-13418-1-git-send-email-vapier@gentoo.org 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 vapier@gentoo.org
drivers/net/designware.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (3)
-
Mike Frysinger -
Vipin Kumar -
Wolfgang Denk