renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-04 19:54:03 +08:00
Code

Revert "ASoC: fsl_ssi: convert to use devm_clk_get"

Browse Source 
This reverts commit 014e5b5670 since
PowerPC doesn't use clkdev and hasn't implemented devm_clk_get() itself.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-06-05 11:08:45 +01:00
parent 134b2f576b
commit 61dc479e99
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/fsl/fsl_ssi.c
View File

@ -725,7 +725,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev)
u32 dma_events[2]; u32 dma_events[2];
ssi_private->ssi_on_imx = true; ssi_private->ssi_on_imx = true;
ssi_private->clk = devm_clk_get(&pdev->dev, NULL); ssi_private->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(ssi_private->clk)) { if (IS_ERR(ssi_private->clk)) {
ret = PTR_ERR(ssi_private->clk); ret = PTR_ERR(ssi_private->clk);
dev_err(&pdev->dev, "could not get clock: %d\n", ret); dev_err(&pdev->dev, "could not get clock: %d\n", ret);
@ -842,8 +842,10 @@ error_dev:
device_remove_file(&pdev->dev, dev_attr); device_remove_file(&pdev->dev, dev_attr);
error_clk: error_clk:
if (ssi_private->ssi_on_imx) if (ssi_private->ssi_on_imx) {
clk_disable_unprepare(ssi_private->clk); clk_disable_unprepare(ssi_private->clk);
clk_put(ssi_private->clk);
}
error_irq: error_irq:
free_irq(ssi_private->irq, ssi_private); free_irq(ssi_private->irq, ssi_private);
@ -869,6 +871,7 @@ static int fsl_ssi_remove(struct platform_device *pdev)
if (ssi_private->ssi_on_imx) { if (ssi_private->ssi_on_imx) {
platform_device_unregister(ssi_private->imx_pcm_pdev); platform_device_unregister(ssi_private->imx_pcm_pdev);
clk_disable_unprepare(ssi_private->clk); clk_disable_unprepare(ssi_private->clk);
clk_put(ssi_private->clk);
} }
snd_soc_unregister_dai(&pdev->dev); snd_soc_unregister_dai(&pdev->dev);
device_remove_file(&pdev->dev, &ssi_private->dev_attr); device_remove_file(&pdev->dev, &ssi_private->dev_attr);