Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 624e2d21 authored by Jonas Gorski's avatar Jonas Gorski Committed by David S. Miller
Browse files

bcm63xx_enet: properly prepare/unprepare clocks before/after usage 



Use clk_prepare_enable/disable_unprepare calls in preparation for
switching to the generic clock framework.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Acked-by: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a80b5e1

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+6 −6
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ static int bcm_enet_probe(struct platform_device *pdev) 
		ret = PTR_ERR(priv->mac_clk);

		goto out;

	}

	clk_enable(priv->mac_clk);

	clk_prepare_enable(priv->mac_clk);



	/* initialize default and fetch platform data */

	priv->rx_ring_size = BCMENET_DEF_RX_DESC;
@@ -1699,7 +1699,7 @@ static int bcm_enet_probe(struct platform_device *pdev) 
			priv->phy_clk = NULL;

			goto out_put_clk_mac;

		}

		clk_enable(priv->phy_clk);

		clk_prepare_enable(priv->phy_clk);

	}



	/* do minimal hardware init to be able to probe mii bus */
@@ -1800,12 +1800,12 @@ static int bcm_enet_probe(struct platform_device *pdev) 
	/* turn off mdc clock */

	enet_writel(priv, 0, ENET_MIISC_REG);

	if (priv->phy_clk) {

		clk_disable(priv->phy_clk);

		clk_disable_unprepare(priv->phy_clk);

		clk_put(priv->phy_clk);

	}



out_put_clk_mac:

	clk_disable(priv->mac_clk);

	clk_disable_unprepare(priv->mac_clk);

	clk_put(priv->mac_clk);

out:

	free_netdev(dev);
@@ -1843,10 +1843,10 @@ static int bcm_enet_remove(struct platform_device *pdev) 


	/* disable hw block clocks */

	if (priv->phy_clk) {

		clk_disable(priv->phy_clk);

		clk_disable_unprepare(priv->phy_clk);

		clk_put(priv->phy_clk);

	}

	clk_disable(priv->mac_clk);

	clk_disable_unprepare(priv->mac_clk);

	clk_put(priv->mac_clk);



	platform_set_drvdata(pdev, NULL);