diff options
| author | Neil Mandir <[email protected]> | 2025-08-26 14:30:22 +0000 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2025-08-28 08:12:21 +0000 |
| commit | dac978e51cce0c1f00a14c4a82f81d387f79b2d4 (patch) | |
| tree | af2456b89b87a8761e093a58802800d82151e3d5 /drivers/net/ethernet/cadence/macb_main.c | |
| parent | Merge branch 'locking-fixes-for-fbnic-driver' (diff) | |
| download | kernel-dac978e51cce0c1f00a14c4a82f81d387f79b2d4.tar.gz kernel-dac978e51cce0c1f00a14c4a82f81d387f79b2d4.zip | |
net: macb: Disable clocks once
When the driver is removed the clocks are disabled twice: once in
macb_remove and a second time by runtime pm. Disable wakeup in remove so
all the clocks are disabled and skip the second call to macb_clks_disable.
Always suspend the device as we always set it active in probe.
Fixes: d54f89af6cc4 ("net: macb: Add pm runtime support")
Signed-off-by: Neil Mandir <[email protected]>
Co-developed-by: Sean Anderson <[email protected]>
Signed-off-by: Sean Anderson <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb_main.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 106885451147..16d28a8b3b56 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -5404,14 +5404,11 @@ static void macb_remove(struct platform_device *pdev) mdiobus_unregister(bp->mii_bus); mdiobus_free(bp->mii_bus); + device_set_wakeup_enable(&bp->pdev->dev, 0); cancel_work_sync(&bp->hresp_err_bh_work); pm_runtime_disable(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - if (!pm_runtime_suspended(&pdev->dev)) { - macb_clks_disable(bp->pclk, bp->hclk, bp->tx_clk, - bp->rx_clk, bp->tsu_clk); - pm_runtime_set_suspended(&pdev->dev); - } + pm_runtime_set_suspended(&pdev->dev); phylink_destroy(bp->phylink); free_netdev(dev); } |