From: Boris BREZILLON <b.brezillon@overkiz.com> To: Nicolas Ferre <nicolas.ferre@atmel.com>, Ludovic Desroches <ludovic.desroches@atmel.com>, Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>, Chris Ball <cjb@laptop.org> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Boris BREZILLON <b.brezillon@overkiz.com> Subject: [PATCH 2/8] at_hdmac: prepare clk before calling enable Date: Wed, 19 Jun 2013 13:15:44 +0200 [thread overview] Message-ID: <1371640544-9515-1-git-send-email-b.brezillon@overkiz.com> (raw) In-Reply-To: <1371640263-9268-1-git-send-email-b.brezillon@overkiz.com> Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to avoid common clk framework warnings. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- drivers/dma/at_hdmac.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index e923cda..19a484a 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -1374,7 +1374,9 @@ static int __init at_dma_probe(struct platform_device *pdev) err = PTR_ERR(atdma->clk); goto err_clk; } - clk_enable(atdma->clk); + err = clk_prepare_enable(atdma->clk); + if (err) + goto err_clk_prepare; /* force dma off, just in case */ at_dma_off(atdma); @@ -1475,7 +1477,8 @@ err_pool_create: platform_set_drvdata(pdev, NULL); free_irq(platform_get_irq(pdev, 0), atdma); err_irq: - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); +err_clk_prepare: clk_put(atdma->clk); err_clk: iounmap(atdma->regs); @@ -1512,7 +1515,7 @@ static int at_dma_remove(struct platform_device *pdev) list_del(&chan->device_node); } - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); clk_put(atdma->clk); iounmap(atdma->regs); @@ -1531,7 +1534,7 @@ static void at_dma_shutdown(struct platform_device *pdev) struct at_dma *atdma = platform_get_drvdata(pdev); at_dma_off(platform_get_drvdata(pdev)); - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); } static int at_dma_prepare(struct device *dev) @@ -1588,7 +1591,7 @@ static int at_dma_suspend_noirq(struct device *dev) /* disable DMA controller */ at_dma_off(atdma); - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); return 0; } @@ -1618,7 +1621,9 @@ static int at_dma_resume_noirq(struct device *dev) struct dma_chan *chan, *_chan; /* bring back DMA controller */ - clk_enable(atdma->clk); + err = clk_prepare_enable(atdma->clk); + if (err) + return err; dma_writel(atdma, EN, AT_DMA_ENABLE); /* clear any pending interrupt */ -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: b.brezillon@overkiz.com (Boris BREZILLON) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/8] at_hdmac: prepare clk before calling enable Date: Wed, 19 Jun 2013 13:15:44 +0200 [thread overview] Message-ID: <1371640544-9515-1-git-send-email-b.brezillon@overkiz.com> (raw) In-Reply-To: <1371640263-9268-1-git-send-email-b.brezillon@overkiz.com> Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to avoid common clk framework warnings. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- drivers/dma/at_hdmac.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index e923cda..19a484a 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c @@ -1374,7 +1374,9 @@ static int __init at_dma_probe(struct platform_device *pdev) err = PTR_ERR(atdma->clk); goto err_clk; } - clk_enable(atdma->clk); + err = clk_prepare_enable(atdma->clk); + if (err) + goto err_clk_prepare; /* force dma off, just in case */ at_dma_off(atdma); @@ -1475,7 +1477,8 @@ err_pool_create: platform_set_drvdata(pdev, NULL); free_irq(platform_get_irq(pdev, 0), atdma); err_irq: - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); +err_clk_prepare: clk_put(atdma->clk); err_clk: iounmap(atdma->regs); @@ -1512,7 +1515,7 @@ static int at_dma_remove(struct platform_device *pdev) list_del(&chan->device_node); } - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); clk_put(atdma->clk); iounmap(atdma->regs); @@ -1531,7 +1534,7 @@ static void at_dma_shutdown(struct platform_device *pdev) struct at_dma *atdma = platform_get_drvdata(pdev); at_dma_off(platform_get_drvdata(pdev)); - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); } static int at_dma_prepare(struct device *dev) @@ -1588,7 +1591,7 @@ static int at_dma_suspend_noirq(struct device *dev) /* disable DMA controller */ at_dma_off(atdma); - clk_disable(atdma->clk); + clk_disable_unprepare(atdma->clk); return 0; } @@ -1618,7 +1621,9 @@ static int at_dma_resume_noirq(struct device *dev) struct dma_chan *chan, *_chan; /* bring back DMA controller */ - clk_enable(atdma->clk); + err = clk_prepare_enable(atdma->clk); + if (err) + return err; dma_writel(atdma, EN, AT_DMA_ENABLE); /* clear any pending interrupt */ -- 1.7.9.5
next prev parent reply other threads:[~2013-06-19 11:33 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-19 11:11 [PATCH 0/8] ARM: at91: prepare the move to common clk framework Boris BREZILLON 2013-06-19 11:11 ` Boris BREZILLON 2013-06-19 11:13 ` [PATCH 1/8] ARM: at91/tc/clocksource: replace clk_enable/disable with clk_prepare_enable/disable_unprepare Boris BREZILLON 2013-06-19 11:13 ` Boris BREZILLON 2013-06-20 7:33 ` Nicolas Ferre 2013-06-20 7:33 ` Nicolas Ferre 2013-06-19 11:14 ` [PATCH 2/8] at_hdmac: prepare clk before calling enable Boris BREZILLON 2013-06-19 11:14 ` Boris BREZILLON 2013-06-20 7:43 ` Nicolas Ferre 2013-06-20 7:43 ` Nicolas Ferre 2013-06-21 2:40 ` Vinod Koul 2013-06-21 2:40 ` Vinod Koul 2013-06-24 17:40 ` Nicolas Ferre 2013-06-24 17:40 ` Nicolas Ferre 2013-06-19 11:15 ` Boris BREZILLON [this message] 2013-06-19 11:15 ` Boris BREZILLON 2013-06-19 11:16 ` [PATCH 3/8] mmc: atmel-mci: " Boris BREZILLON 2013-06-19 11:16 ` Boris BREZILLON 2013-06-19 11:16 ` Boris BREZILLON 2013-06-19 12:50 ` Ludovic Desroches 2013-06-19 12:50 ` Ludovic Desroches 2013-06-19 11:17 ` [PATCH 4/8] tty: atmel_serial: " Boris BREZILLON 2013-06-19 11:17 ` Boris BREZILLON 2013-06-19 11:17 ` Boris BREZILLON 2013-06-20 7:48 ` Nicolas Ferre 2013-06-20 7:48 ` Nicolas Ferre 2013-06-20 7:48 ` Nicolas Ferre 2013-06-20 8:06 ` boris brezillon 2013-06-20 8:06 ` boris brezillon 2013-06-20 10:20 ` Nicolas Ferre 2013-06-20 10:20 ` Nicolas Ferre 2013-06-20 10:20 ` Nicolas Ferre 2013-06-19 11:18 ` [PATCH 5/8] usb: gadget: at91_udc: " Boris BREZILLON 2013-06-19 11:18 ` Boris BREZILLON 2013-06-19 11:20 ` [PATCH 6/8] ehci-atmel.c: " Boris BREZILLON 2013-06-19 11:20 ` Boris BREZILLON 2013-06-19 11:21 ` [PATCH 7/8] USB: ohci-at91: " Boris BREZILLON 2013-06-19 11:21 ` Boris BREZILLON 2013-06-19 11:22 ` [PATCH 8/8] at91/avr32/atmel_lcdfb: " Boris BREZILLON 2013-06-19 11:22 ` Boris BREZILLON 2013-06-19 11:22 ` Boris BREZILLON 2013-06-20 7:49 ` Nicolas Ferre 2013-06-20 7:49 ` Nicolas Ferre 2013-06-20 7:49 ` Nicolas Ferre
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1371640544-9515-1-git-send-email-b.brezillon@overkiz.com \ --to=b.brezillon@overkiz.com \ --cc=cjb@laptop.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=ludovic.desroches@atmel.com \ --cc=nicolas.ferre@atmel.com \ --cc=plagnioj@jcrosoft.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.