shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

bcm63xx_enet: avoid uninitialized variable warning

Browse Source 
commit df384d435a upstream.

gcc-7 and probably earlier versions get confused by this function
and print a harmless warning:

drivers/net/ethernet/broadcom/bcm63xx_enet.c: In function 'bcm_enet_open':
drivers/net/ethernet/broadcom/bcm63xx_enet.c:1130:3: error: 'phydev' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This adds an initialization for the 'phydev' variable when it is unused
and changes the check to test for that NULL pointer to make it clear
that we always pass a valid pointer here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann
2017-01-18 15:52:53 +01:00
committed by Greg Kroah-Hartman
parent b7e968da04
commit 04275d2a8a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/broadcom/bcm63xx_enet.c
View File

@@ -913,6 +913,8 @@ static int bcm_enet_open(struct net_device *dev)
priv->old_link = 0; priv->old_link = 0;
priv->old_duplex = -1; priv->old_duplex = -1;
priv->old_pause = -1; priv->old_pause = -1;
} else {
phydev = NULL;
} }
/* mask all interrupts and request them */ /* mask all interrupts and request them */
@@ -1083,7 +1085,7 @@ static int bcm_enet_open(struct net_device *dev)
enet_dmac_writel(priv, priv->dma_chan_int_mask, enet_dmac_writel(priv, priv->dma_chan_int_mask,
ENETDMAC_IRMASK, priv->tx_chan); ENETDMAC_IRMASK, priv->tx_chan);
if (priv->has_phy) if (phydev)
phy_start(phydev); phy_start(phydev);
else else
bcm_enet_adjust_link(dev); bcm_enet_adjust_link(dev);
@@ -1126,7 +1128,7 @@ out_freeirq:
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
out_phy_disconnect: out_phy_disconnect:
if (priv->has_phy) if (phydev)
phy_disconnect(phydev); phy_disconnect(phydev);
return ret; return ret;