| Message ID | 1307027978-13418-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted |
| Commit | ee7f5bfd124c61370a2fa417ca6d21d587d23a3f |
| Delegated to: | Wolfgang Denk |
| Headers | show |
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
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)
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(-)