Commit 5d744ee9 authored Jul 10, 2020 by Nicolas Ferre Committed by Greg Kroah-Hartman Jul 16, 2020

net: macb: fix wakeup test in runtime suspend/resume routines



[ Upstream commit 515a10a701d570e26dfbe6ee373f77c8bf11053f ]

Use the proper struct device pointer to check if the wakeup flag
and wakeup source are positioned.
Use the one passed by function call which is equivalent to
&bp->dev->dev.parent.

It's preventing the trigger of a spurious interrupt in case the
Wake-on-Lan feature is used.

Fixes: d54f89af ("net: macb: Add pm runtime support")
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
Cc: Harini Katakam <harini.katakam@xilinx.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 15442ef5

drivers/net/ethernet/cadence/macb_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4507,7 +4507,7 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev)
		struct net_device *netdev = dev_get_drvdata(dev);
		struct macb *bp = netdev_priv(netdev);

		if (!(device_may_wakeup(&bp->dev->dev))) {
		if (!(device_may_wakeup(dev))) {
		clk_disable_unprepare(bp->tx_clk);
		clk_disable_unprepare(bp->hclk);
		clk_disable_unprepare(bp->pclk);
		@@ -4523,7 +4523,7 @@ static int __maybe_unused macb_runtime_resume(struct device *dev)
		struct net_device *netdev = dev_get_drvdata(dev);
		struct macb *bp = netdev_priv(netdev);

		if (!(device_may_wakeup(&bp->dev->dev))) {
		if (!(device_may_wakeup(dev))) {
		clk_prepare_enable(bp->pclk);
		clk_prepare_enable(bp->hclk);
		clk_prepare_enable(bp->tx_clk);