Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3d4f11 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: remove wol_enabled conditional code 



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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 575a1935

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+0 −9
Original line number Diff line number Diff line
@@ -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;
@@ -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);

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+0 −1
Original line number Diff line number Diff line
@@ -583,7 +583,6 @@ struct bcmgenet_priv { 
	struct platform_device *pdev;



	/* WOL */

	unsigned long wol_enabled;

	struct clk *clk_wol;

	u32 wolopts;