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

Commit ace58010 authored by Steffen Trumtrar's avatar Steffen Trumtrar Committed by David S. Miller
Browse files

net/macb: make clk_enable atomic 



Use clk_prepare_enable/clk_disable_unprepare to be safe on SMP systems.

Signed-off-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Fabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1ae385d

drivers/net/ethernet/cadence/macb.c

+10 −10
Original line number Diff line number Diff line
@@ -1561,14 +1561,14 @@ static int __init macb_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to get macb_clk\n");

		goto err_out_free_dev;

	}

	clk_enable(bp->pclk);

	clk_prepare_enable(bp->pclk);



	bp->hclk = clk_get(&pdev->dev, "hclk");

	if (IS_ERR(bp->hclk)) {

		dev_err(&pdev->dev, "failed to get hclk\n");

		goto err_out_put_pclk;

	}

	clk_enable(bp->hclk);

	clk_prepare_enable(bp->hclk);



	bp->regs = ioremap(regs->start, resource_size(regs));

	if (!bp->regs) {
@@ -1658,9 +1658,9 @@ static int __init macb_probe(struct platform_device *pdev) 
err_out_iounmap:

	iounmap(bp->regs);

err_out_disable_clocks:

	clk_disable(bp->hclk);

	clk_disable_unprepare(bp->hclk);

	clk_put(bp->hclk);

	clk_disable(bp->pclk);

	clk_disable_unprepare(bp->pclk);

err_out_put_pclk:

	clk_put(bp->pclk);

err_out_free_dev:
@@ -1687,9 +1687,9 @@ static int __exit macb_remove(struct platform_device *pdev) 
		unregister_netdev(dev);

		free_irq(dev->irq, dev);

		iounmap(bp->regs);

		clk_disable(bp->hclk);

		clk_disable_unprepare(bp->hclk);

		clk_put(bp->hclk);

		clk_disable(bp->pclk);

		clk_disable_unprepare(bp->pclk);

		clk_put(bp->pclk);

		free_netdev(dev);

		platform_set_drvdata(pdev, NULL);
@@ -1707,8 +1707,8 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state) 
	netif_carrier_off(netdev);

	netif_device_detach(netdev);



	clk_disable(bp->hclk);

	clk_disable(bp->pclk);

	clk_disable_unprepare(bp->hclk);

	clk_disable_unprepare(bp->pclk);



	return 0;

}
@@ -1718,8 +1718,8 @@ static int macb_resume(struct platform_device *pdev) 
	struct net_device *netdev = platform_get_drvdata(pdev);

	struct macb *bp = netdev_priv(netdev);



	clk_enable(bp->pclk);

	clk_enable(bp->hclk);

	clk_prepare_enable(bp->pclk);

	clk_prepare_enable(bp->hclk);



	netif_device_attach(netdev);