diff options
| author | Richard Zhao <richard.zhao@freescale.com> | 2012-06-04 09:42:53 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-04 11:23:51 +0100 |
| commit | 014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea (patch) | |
| tree | c2a5b9b18068444fd297e4f161b0b582ccf5c1d3 /sound/soc/fsl | |
| parent | ec02995adad5a7b428f46c1a87fae1bc93d6dfe3 (diff) | |
| download | linux-3.10-014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea.tar.gz linux-3.10-014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea.tar.bz2 linux-3.10-014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea.zip | |
ASoC: fsl_ssi: convert to use devm_clk_get
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | 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 4ed2afd4778..b10a427a809 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); |