net: macb: Disable clocks once

[ Upstream commit dac978e51cce0c1f00a14c4a82f81d387f79b2d4 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 2421a7bcd221e6fad7d1d2301301eb215145701d..6c2d69ef1a8dbd9721232a24cd1856a38cce477a 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -5230,14 +5230,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);
        }