net: stmmac: fix stmmac_xdp_open() clk_ptp_ref error cleanup

Neither stmmac_xdp_release() nor the normal paths of stmmac_xdp_open()
touch clk_ptp_ref, so stmmac_xdp_open() should not be doing anything
with this clock. However, in its error path, it calls
stmmac_hw_teardown() which disables and unprepares this clock, which
can lead to the clock state becoming unbalanced when the netdev is
taken administratively down.

Remove this call to stmmac_hw_teardown(), and as this is the last user
of this function, remove the function as well.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 167405aac5b885a7510a8de636af370c400850f6..8cb1a97e18af9c3493d8a46f3f459e314ff5d1db 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3568,13 +3568,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)
        return 0;
 }
 
-static void stmmac_hw_teardown(struct net_device *dev)
-{
-       struct stmmac_priv *priv = netdev_priv(dev);
-
-       clk_disable_unprepare(priv->plat->clk_ptp_ref);
-}
-
 static void stmmac_free_irq(struct net_device *dev,
                            enum request_irq_err irq_err, int irq_idx)
 {
@@ -6992,7 +6985,6 @@ irq_error:
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
                hrtimer_cancel(&priv->dma_conf.tx_queue[chan].txtimer);
 
-       stmmac_hw_teardown(dev);
 init_error:
        free_dma_desc_resources(priv, &priv->dma_conf);
 dma_desc_error: