diff options
author | Richard Zhao <richard.zhao@freescale.com> | 2012-06-03 21:42:53 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-04 06:23:51 -0400 |
commit | 014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea (patch) | |
tree | c2a5b9b18068444fd297e4f161b0b582ccf5c1d3 /sound/soc/fsl | |
parent | ec02995adad5a7b428f46c1a87fae1bc93d6dfe3 (diff) |
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 4ed2afd47782..b10a427a8098 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) | |||
725 | u32 dma_events[2]; | 725 | u32 dma_events[2]; |
726 | ssi_private->ssi_on_imx = true; | 726 | ssi_private->ssi_on_imx = true; |
727 | 727 | ||
728 | ssi_private->clk = clk_get(&pdev->dev, NULL); | 728 | ssi_private->clk = devm_clk_get(&pdev->dev, NULL); |
729 | if (IS_ERR(ssi_private->clk)) { | 729 | if (IS_ERR(ssi_private->clk)) { |
730 | ret = PTR_ERR(ssi_private->clk); | 730 | ret = PTR_ERR(ssi_private->clk); |
731 | dev_err(&pdev->dev, "could not get clock: %d\n", ret); | 731 | dev_err(&pdev->dev, "could not get clock: %d\n", ret); |
@@ -842,10 +842,8 @@ error_dev: | |||
842 | device_remove_file(&pdev->dev, dev_attr); | 842 | device_remove_file(&pdev->dev, dev_attr); |
843 | 843 | ||
844 | error_clk: | 844 | error_clk: |
845 | if (ssi_private->ssi_on_imx) { | 845 | if (ssi_private->ssi_on_imx) |
846 | clk_disable_unprepare(ssi_private->clk); | 846 | clk_disable_unprepare(ssi_private->clk); |
847 | clk_put(ssi_private->clk); | ||
848 | } | ||
849 | 847 | ||
850 | error_irq: | 848 | error_irq: |
851 | free_irq(ssi_private->irq, ssi_private); | 849 | free_irq(ssi_private->irq, ssi_private); |
@@ -871,7 +869,6 @@ static int fsl_ssi_remove(struct platform_device *pdev) | |||
871 | if (ssi_private->ssi_on_imx) { | 869 | if (ssi_private->ssi_on_imx) { |
872 | platform_device_unregister(ssi_private->imx_pcm_pdev); | 870 | platform_device_unregister(ssi_private->imx_pcm_pdev); |
873 | clk_disable_unprepare(ssi_private->clk); | 871 | clk_disable_unprepare(ssi_private->clk); |
874 | clk_put(ssi_private->clk); | ||
875 | } | 872 | } |
876 | snd_soc_unregister_dai(&pdev->dev); | 873 | snd_soc_unregister_dai(&pdev->dev); |
877 | device_remove_file(&pdev->dev, &ssi_private->dev_attr); | 874 | device_remove_file(&pdev->dev, &ssi_private->dev_attr); |