From: richard.zhao@freescale.com (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 06/11] ASoC: fsl_ssi: convert to use devm_clk_get
Date: Wed, 9 May 2012 19:33:05 +0800 [thread overview]
Message-ID: <1336563190-19974-7-git-send-email-richard.zhao@freescale.com> (raw)
In-Reply-To: <1336563190-19974-1-git-send-email-richard.zhao@freescale.com>
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
---
sound/soc/fsl/fsl_ssi.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 4ed2afd..b10a427 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -725,7 +725,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
u32 dma_events[2];
ssi_private->ssi_on_imx = true;
- ssi_private->clk = clk_get(&pdev->dev, NULL);
+ ssi_private->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(ssi_private->clk)) {
ret = PTR_ERR(ssi_private->clk);
dev_err(&pdev->dev, "could not get clock: %d\n", ret);
@@ -842,10 +842,8 @@ error_dev:
device_remove_file(&pdev->dev, dev_attr);
error_clk:
- if (ssi_private->ssi_on_imx) {
+ if (ssi_private->ssi_on_imx)
clk_disable_unprepare(ssi_private->clk);
- clk_put(ssi_private->clk);
- }
error_irq:
free_irq(ssi_private->irq, ssi_private);
@@ -871,7 +869,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
if (ssi_private->ssi_on_imx) {
platform_device_unregister(ssi_private->imx_pcm_pdev);
clk_disable_unprepare(ssi_private->clk);
- clk_put(ssi_private->clk);
}
snd_soc_unregister_dai(&pdev->dev);
device_remove_file(&pdev->dev, &ssi_private->dev_attr);
--
1.7.5.4
next prev parent reply other threads:[~2012-05-09 11:33 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 11:32 [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support Richard Zhao
2012-05-09 11:33 ` [PATCH V2 01/11] dma: imx-sdma: make channel0 operations atomic Richard Zhao
2012-05-10 3:53 ` Vinod Koul
2012-05-10 6:34 ` Shawn Guo
2012-05-10 12:37 ` Shawn Guo
2012-05-11 2:52 ` Vinod Koul
2012-05-11 3:02 ` Shawn Guo
2012-05-11 6:32 ` Vinod Koul
2012-05-11 7:14 ` [PATCH Rebase 1/1] " Richard Zhao
2012-05-11 8:33 ` [alsa-devel] " Vinod Koul
2012-05-09 11:33 ` [PATCH V2 02/11] ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support Richard Zhao
2012-05-10 6:20 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 03/11] ASoC: imx-audmux: add " Richard Zhao
2012-05-09 16:00 ` Mark Brown
2012-05-10 0:35 ` Richard Zhao
2012-05-10 6:39 ` Shawn Guo
2012-05-10 8:44 ` Mark Brown
2012-05-10 9:05 ` Richard Zhao
2012-05-10 9:27 ` Mark Brown
2012-05-10 10:23 ` Richard Zhao
2012-05-10 12:26 ` Linus Walleij
2012-05-10 13:41 ` Richard Zhao
2012-05-10 14:00 ` Linus Walleij
2012-05-11 5:32 ` Shawn Guo
2012-05-11 12:29 ` Linus Walleij
2012-05-11 13:27 ` Arnd Bergmann
2012-05-10 15:48 ` [alsa-devel] " Stephen Warren
2012-05-10 9:07 ` Shawn Guo
2012-05-10 9:25 ` Mark Brown
2012-05-10 12:32 ` Shawn Guo
2012-05-10 12:20 ` Linus Walleij
2012-05-10 3:28 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 04/11] ARM: dts: imx6q-sabrelite: add audmux " Richard Zhao
2012-05-10 3:29 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 05/11] ARM: imx6q: add ssi1_ipg clk_lookup Richard Zhao
2012-05-09 11:33 ` Richard Zhao [this message]
2012-05-09 11:50 ` [PATCH V2 06/11] ASoC: fsl_ssi: convert to use devm_clk_get Mark Brown
2012-05-09 11:59 ` Shawn Guo
2012-05-09 12:01 ` Mark Brown
2012-05-09 12:03 ` Shawn Guo
2012-05-09 16:09 ` Timur Tabi
2012-05-09 11:33 ` [PATCH V2 07/11] ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 Richard Zhao
2012-05-09 11:33 ` [PATCH V2 08/11] ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000 Richard Zhao
2012-05-10 6:48 ` Shawn Guo
2012-05-10 9:34 ` Richard Zhao
2012-05-10 9:41 ` Shawn Guo
2012-05-10 9:45 ` Mark Brown
2012-05-10 10:18 ` Richard Zhao
2012-05-10 11:49 ` Shawn Guo
2012-05-10 15:48 ` [alsa-devel] " Shawn Guo
2012-05-10 9:45 ` Shawn Guo
2012-05-09 11:33 ` [PATCH V2 09/11] ARM: dts: imx6q-sabrelite: add serial2 pinctrl support Richard Zhao
2012-05-10 3:33 ` Dong Aisheng
2012-05-09 11:33 ` [PATCH V2 10/11] ARM: imx6q: change clkdev device name from xxxx.uart to xxxx.serial Richard Zhao
2012-05-10 6:51 ` Shawn Guo
2012-05-09 11:33 ` [PATCH V2 11/11] ARM: imx6q: change clkdev device name from xxxx.enet to xxxx.ethernet Richard Zhao
2012-05-11 6:30 ` [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support Shawn Guo
2012-05-21 12:59 ` Richard Zhao
2012-05-21 14:45 ` Mark Brown
2012-05-22 1:39 ` Richard Zhao
2012-05-22 9:56 ` Mark Brown
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=1336563190-19974-7-git-send-email-richard.zhao@freescale.com \
--to=richard.zhao@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).