From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Subject: [PATCH] net: bcmgenet: Fix compile warning Date: Tue, 23 Sep 2014 15:19:41 +0200 Message-ID: <1411478381-9059-1-git-send-email-tklauser@distanz.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: "David S. Miller" , Geert Uytterhoeven , netdev@vger.kernel.org To: Florian Fainelli Return-path: Received: from mail.zhinst.com ([212.126.164.98]:53547 "EHLO mail.zhinst.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751307AbaIWNTt (ORCPT ); Tue, 23 Sep 2014 09:19:49 -0400 Sender: netdev-owner@vger.kernel.org List-ID: bcmgenet_wol_resume() is only used in bcmgenet_resume(), which is only defined when CONFIG_PM_SLEEP is enabled. This leads to the following compile warning when building with !CONFIG_PM_SLEEP: drivers/net/ethernet/broadcom/genet/bcmgenet.c:1967:12: warning: =E2=80= =98bcmgenet_wol_resume=E2=80=99 defined but not used [-Wunused-function= ] Since bcmgenet_resume() is the only user of bcmgenet_wol_resume(), fix this by directly inlining the function there. Reported-by: Geert Uytterhoeven Signed-off-by: Tobias Klauser --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 23 +++++++-----------= ----- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/n= et/ethernet/broadcom/genet/bcmgenet.c index 313c400..e852d20 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1964,19 +1964,6 @@ static void bcmgenet_set_hw_addr(struct bcmgenet= _priv *priv, bcmgenet_umac_writel(priv, (addr[4] << 8) | addr[5], UMAC_MAC1); } =20 -static int bcmgenet_wol_resume(struct bcmgenet_priv *priv) -{ - /* From WOL-enabled suspend, switch to regular clock */ - if (priv->wolopts) - clk_disable_unprepare(priv->clk_wol); - - phy_init_hw(priv->phydev); - /* Speed settings must be restored */ - bcmgenet_mii_config(priv->dev); - - return 0; -} - /* Returns a reusable dma control register value */ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) { @@ -2681,9 +2668,13 @@ static int bcmgenet_resume(struct device *d) if (ret) goto out_clk_disable; =20 - ret =3D bcmgenet_wol_resume(priv); - if (ret) - goto out_clk_disable; + /* From WOL-enabled suspend, switch to regular clock */ + if (priv->wolopts) + clk_disable_unprepare(priv->clk_wol); + + phy_init_hw(priv->phydev); + /* Speed settings must be restored */ + bcmgenet_mii_config(priv->dev); =20 /* disable ethernet MAC while updating its registers */ umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, false); --=20 2.0.1