diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 16281ad2da12..3cbf29095257 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c | |||
@@ -1994,12 +1994,6 @@ static int bcmgenet_open(struct net_device *dev) | |||
1994 | 1994 | ||
1995 | bcmgenet_set_hw_addr(priv, dev->dev_addr); | 1995 | bcmgenet_set_hw_addr(priv, dev->dev_addr); |
1996 | 1996 | ||
1997 | if (priv->wol_enabled) { | ||
1998 | ret = bcmgenet_wol_resume(priv); | ||
1999 | if (ret) | ||
2000 | return ret; | ||
2001 | } | ||
2002 | |||
2003 | if (phy_is_internal(priv->phydev)) { | 1997 | if (phy_is_internal(priv->phydev)) { |
2004 | reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT); | 1998 | reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT); |
2005 | reg |= EXT_ENERGY_DET_MASK; | 1999 | reg |= EXT_ENERGY_DET_MASK; |
@@ -2161,9 +2155,6 @@ static int bcmgenet_close(struct net_device *dev) | |||
2161 | if (phy_is_internal(priv->phydev)) | 2155 | if (phy_is_internal(priv->phydev)) |
2162 | bcmgenet_power_down(priv, GENET_POWER_PASSIVE); | 2156 | bcmgenet_power_down(priv, GENET_POWER_PASSIVE); |
2163 | 2157 | ||
2164 | if (priv->wol_enabled) | ||
2165 | clk_enable(priv->clk_wol); | ||
2166 | |||
2167 | if (!IS_ERR(priv->clk)) | 2158 | if (!IS_ERR(priv->clk)) |
2168 | clk_disable_unprepare(priv->clk); | 2159 | clk_disable_unprepare(priv->clk); |
2169 | 2160 | ||
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index e23c993b1362..f4891a1b6758 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h | |||
@@ -583,7 +583,6 @@ struct bcmgenet_priv { | |||
583 | struct platform_device *pdev; | 583 | struct platform_device *pdev; |
584 | 584 | ||
585 | /* WOL */ | 585 | /* WOL */ |
586 | unsigned long wol_enabled; | ||
587 | struct clk *clk_wol; | 586 | struct clk *clk_wol; |
588 | u32 wolopts; | 587 | u32 wolopts; |
589 | 588 | ||