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

Commit fb12b3e6 authored by Doug Berger's avatar Doug Berger Committed by Greg Kroah-Hartman
Browse files

net: bcmgenet: code movement 



[ Upstream commit a94cbf03eb514d4d64d8c4f4caa0616b7ce5040a ]

This commit switches the order of bcmgenet_suspend and bcmgenet_resume
in the file to prevent the need for a forward declaration in the next
commit and to make the review of that commit easier.

Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 747c7d5a

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

+30 −30
Original line number Diff line number Diff line
@@ -3616,36 +3616,6 @@ static int bcmgenet_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM_SLEEP

static int bcmgenet_suspend(struct device *d)

{

	struct net_device *dev = dev_get_drvdata(d);

	struct bcmgenet_priv *priv = netdev_priv(dev);

	int ret = 0;



	if (!netif_running(dev))

		return 0;



	netif_device_detach(dev);



	bcmgenet_netif_stop(dev);



	if (!device_may_wakeup(d))

		phy_suspend(dev->phydev);



	/* Prepare the device for Wake-on-LAN and switch to the slow clock */

	if (device_may_wakeup(d) && priv->wolopts) {

		ret = bcmgenet_power_down(priv, GENET_POWER_WOL_MAGIC);

		clk_prepare_enable(priv->clk_wol);

	} else if (priv->internal_phy) {

		ret = bcmgenet_power_down(priv, GENET_POWER_PASSIVE);

	}



	/* Turn off the clocks */

	clk_disable_unprepare(priv->clk);



	return ret;

}



static int bcmgenet_resume(struct device *d)

{

	struct net_device *dev = dev_get_drvdata(d);
@@ -3724,6 +3694,36 @@ static int bcmgenet_resume(struct device *d) 
	clk_disable_unprepare(priv->clk);

	return ret;

}



static int bcmgenet_suspend(struct device *d)

{

	struct net_device *dev = dev_get_drvdata(d);

	struct bcmgenet_priv *priv = netdev_priv(dev);

	int ret = 0;



	if (!netif_running(dev))

		return 0;



	netif_device_detach(dev);



	bcmgenet_netif_stop(dev);



	if (!device_may_wakeup(d))

		phy_suspend(dev->phydev);



	/* Prepare the device for Wake-on-LAN and switch to the slow clock */

	if (device_may_wakeup(d) && priv->wolopts) {

		ret = bcmgenet_power_down(priv, GENET_POWER_WOL_MAGIC);

		clk_prepare_enable(priv->clk_wol);

	} else if (priv->internal_phy) {

		ret = bcmgenet_power_down(priv, GENET_POWER_PASSIVE);

	}



	/* Turn off the clocks */

	clk_disable_unprepare(priv->clk);



	return ret;

}

#endif /* CONFIG_PM_SLEEP */



static SIMPLE_DEV_PM_OPS(bcmgenet_pm_ops, bcmgenet_suspend, bcmgenet_resume);