Skip to content

Commit

Permalink
ASoC: fsl_ssi: convert to use devm_clk_get
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Zhao authored and Mark Brown committed Jun 4, 2012
1 parent ec02995 commit 014e5b5
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -842,10 +842,8 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
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);
Expand All @@ -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);
Expand Down

0 comments on commit 014e5b5

Please sign in to comment.