net: macb: Disable clocks once
authorNeil Mandir <neil.mandir@seco.com>
Tue, 26 Aug 2025 14:30:22 +0000 (10:30 -0400)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 28 Aug 2025 08:12:21 +0000 (10:12 +0200)
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 <neil.mandir@seco.com>
Co-developed-by: Sean Anderson <sean.anderson@linux.dev>
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Link: https://patch.msgid.link/20250826143022.935521-1-sean.anderson@linux.dev
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/cadence/macb_main.c

index 10688545114708cd208ecd9a4264d6d2df993cba..16d28a8b3b56cc0e66007a4013faf32d7263fb92 100644 (file)
@@ -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);
        }