From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753194AbdARPEc (ORCPT ); Wed, 18 Jan 2017 10:04:32 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:49170 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751642AbdARPEa (ORCPT ); Wed, 18 Jan 2017 10:04:30 -0500 From: Arnd Bergmann To: Florian Fainelli , "David S. Miller" Cc: Arnd Bergmann , bcm-kernel-feedback-list@broadcom.com, Philippe Reynes , "xypron.glpk@gmx.de" , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] bcm63xx_enet: avoid uninitialized variable warning Date: Wed, 18 Jan 2017 15:52:53 +0100 Message-Id: <20170118145306.1004008-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170118145306.1004008-1-arnd@arndb.de> References: <20170118145306.1004008-1-arnd@arndb.de> X-Provags-ID: V03:K0:aBzMEV6WNAaNjcQggDwceH1gpITF0Uhm6fapKiLkn2M4pPjbV8p TPsmLtQ4qHddwocK9yPF75Yf1lEB88pLvpfbsYPHhSMxpo0OTSJtlBvYw2BWk0LtSXaDsQu UjE2aEv601cUpy7deQ/TK1g9Q+6VB4g96PfItB0imElJ4LvQC1OSQjhfC4PD6WIUHVIpRKQ cCZDf8OO+UF9YgvyU6sVA== X-UI-Out-Filterresults: notjunk:1;V01:K0:VebhGIXyjes=:oF2nQGiCA5y71Jn3qVzaiu AAcxQIBetOO+h3Sv51K7cgnVudkWT71oq18nGQA2Y8CiG+R/8OAe/fKzkaYCLtcHN4J/vcomJ W5P+w/oQJdv9lq6MdFU4DFRNoACkTsqSzG5yEA1YnQaheptk2h2tOTF7o/74Y2lGEWAZuc7p/ s57/8lvCGwBR1SkhTRSVXIxngM3Ea9xXN0wQiimnxqKVFy8aMn4sA10/IPM9h48PDY8BAd9s5 bnHyJaeVmf3j6niBEyWfA3fVvQd2p/Jy/HGFRalzMXfmkbhm9HHMCovB5t9ly67K3/n1cTbE4 pxBYWDaPHc9gw0RPyRV89ugGJYGhFW3Eky3fkzTTy4URGfxPIoQjdavDj9WycEYQxTnbh6z5p RGmUlLcxrW9YpcwJPYqnmvFK3JzAdqY7P/YdGY9xvTtT4qj3pcKCb4O9li2gIfULLGCwKSnSP K5nIZUKBOPDONFMkubFiDq4kWfZnYubkBMiDJH9uqTAjrVfbpk0mxSfTFikQZKFx5BhUbJSZ/ /NXTDxRWSGPSjlQVY9PzHydg+grUgcETjw/2JHO9BZcNj7O4M/qZpZkDUhDpz05Y6RZg2q51m 9ExQURh4/1sYqiNJbsKN79wamMdDOSFbPCpWj6K8ZO7E8HjCR+VanpqrXMiarAJ5bQiZHVLom yrFH7WnkHHiuYBPd4rZ+jyeM9BvpUqNYtJ5osp9o0eW0UsHu3iNa6jPKCwfqh53ioM3s= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 1ad904680ca6..f0a0bcb31b7e 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -913,6 +913,8 @@ static int bcm_enet_open(struct net_device *dev) priv->old_link = 0; priv->old_duplex = -1; priv->old_pause = -1; + } else { + phydev = NULL; } /* 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, ENETDMAC_IRMASK, priv->tx_chan); - if (priv->has_phy) + if (phydev) phy_start(phydev); else bcm_enet_adjust_link(dev); @@ -1126,7 +1128,7 @@ static int bcm_enet_open(struct net_device *dev) free_irq(dev->irq, dev); out_phy_disconnect: - if (priv->has_phy) + if (phydev) phy_disconnect(phydev); return ret; -- 2.9.0