Skip to content

Commit

Permalink
net: bcmgenet: remove wol_enabled conditional code
Browse files Browse the repository at this point in the history
Checking for wol_enabled in bcmgenet_close() is bogus, since no other
code places set priv->wol_enabled. Remove that as it will conflict with
the upcoming and functional Wake-on-LAN implementation.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Jul 21, 2014
1 parent 575a193 commit ef3d4f1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
9 changes: 0 additions & 9 deletions drivers/net/ethernet/broadcom/genet/bcmgenet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1994,12 +1994,6 @@ static int bcmgenet_open(struct net_device *dev)

bcmgenet_set_hw_addr(priv, dev->dev_addr);

if (priv->wol_enabled) {
ret = bcmgenet_wol_resume(priv);
if (ret)
return ret;
}

if (phy_is_internal(priv->phydev)) {
reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);
reg |= EXT_ENERGY_DET_MASK;
Expand Down Expand Up @@ -2161,9 +2155,6 @@ static int bcmgenet_close(struct net_device *dev)
if (phy_is_internal(priv->phydev))
bcmgenet_power_down(priv, GENET_POWER_PASSIVE);

if (priv->wol_enabled)
clk_enable(priv->clk_wol);

if (!IS_ERR(priv->clk))
clk_disable_unprepare(priv->clk);

Expand Down
1 change: 0 additions & 1 deletion drivers/net/ethernet/broadcom/genet/bcmgenet.h
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,6 @@ struct bcmgenet_priv {
struct platform_device *pdev;

/* WOL */
unsigned long wol_enabled;
struct clk *clk_wol;
u32 wolopts;

Expand Down

0 comments on commit ef3d4f1

Please sign in to comment.