Message ID | 1363973615-17863-3-git-send-email-s.trumtrar@pengutronix.de |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Fri, Mar 22, 2013 at 2:33 PM, Steffen Trumtrar
<s.trumtrar@pengutronix.de> wrote:
> Use clk_prepare_enable to be safe on SMP systems.
Wouldn't you have to use clk_disable_unprepare() now?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Fabio Estevam <festevam@gmail.com> Date: Fri, 22 Mar 2013 14:38:39 -0300 > On Fri, Mar 22, 2013 at 2:33 PM, Steffen Trumtrar > <s.trumtrar@pengutronix.de> wrote: >> Use clk_prepare_enable to be safe on SMP systems. > > Wouldn't you have to use clk_disable_unprepare() now? Indeed I think he does. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Mar 24, 2013 at 05:08:49PM -0400, David Miller wrote: > From: Fabio Estevam <festevam@gmail.com> > Date: Fri, 22 Mar 2013 14:38:39 -0300 > > > On Fri, Mar 22, 2013 at 2:33 PM, Steffen Trumtrar > > <s.trumtrar@pengutronix.de> wrote: > >> Use clk_prepare_enable to be safe on SMP systems. > > > > Wouldn't you have to use clk_disable_unprepare() now? > > Indeed I think he does. > I will fix that of course. Thanks, Steffen
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 71e766b..733b3fc 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -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) {
Use clk_prepare_enable to be safe on SMP systems. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> --- drivers/net/ethernet/cadence/macb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)