* [PATCH] net: bcmgenet: Fix compile warning
@ 2014-09-23 13:19 Tobias Klauser
2014-09-23 16:54 ` Florian Fainelli
2014-09-26 20:50 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Tobias Klauser @ 2014-09-23 13:19 UTC (permalink / raw)
To: Florian Fainelli; +Cc: David S. Miller, Geert Uytterhoeven, netdev
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: ‘bcmgenet_wol_resume’ 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 <geert@linux-m68k.org>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
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/net/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);
}
-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;
- ret = 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);
/* disable ethernet MAC while updating its registers */
umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, false);
--
2.0.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net: bcmgenet: Fix compile warning
2014-09-23 13:19 [PATCH] net: bcmgenet: Fix compile warning Tobias Klauser
@ 2014-09-23 16:54 ` Florian Fainelli
2014-09-26 20:50 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2014-09-23 16:54 UTC (permalink / raw)
To: Tobias Klauser; +Cc: David S. Miller, Geert Uytterhoeven, netdev
2014-09-23 6:19 GMT-07:00 Tobias Klauser <tklauser@distanz.ch>:
> 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: ‘bcmgenet_wol_resume’ 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 <geert@linux-m68k.org>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> 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/net/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);
> }
>
> -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;
>
> - ret = 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);
>
> /* disable ethernet MAC while updating its registers */
> umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, false);
> --
> 2.0.1
>
>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net: bcmgenet: Fix compile warning
2014-09-23 13:19 [PATCH] net: bcmgenet: Fix compile warning Tobias Klauser
2014-09-23 16:54 ` Florian Fainelli
@ 2014-09-26 20:50 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-09-26 20:50 UTC (permalink / raw)
To: tklauser; +Cc: f.fainelli, geert, netdev
From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 23 Sep 2014 15:19:41 +0200
> 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: ‘bcmgenet_wol_resume’ 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 <geert@linux-m68k.org>
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-26 20:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-23 13:19 [PATCH] net: bcmgenet: Fix compile warning Tobias Klauser
2014-09-23 16:54 ` Florian Fainelli
2014-09-26 20:50 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).