]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Revert "ASoC: fsl_ssi: convert to use devm_clk_get"
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 Jun 2012 10:08:45 +0000 (11:08 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 Jun 2012 10:08:45 +0000 (11:08 +0100)
This reverts commit 014e5b56702575c5cd8ffc4b1a7924cfdfe0f1ea since
PowerPC doesn't use clkdev and hasn't implemented devm_clk_get() itself.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/fsl/fsl_ssi.c

index b10a427a80985285b7daac489ce0b9e114ae0ddb..4ed2afd47782cba1667cf109d3c63c6d501ba2a1 100644 (file)
@@ -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 = devm_clk_get(&pdev->dev, NULL);
+               ssi_private->clk = 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,8 +842,10 @@ 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);
@@ -869,6 +871,7 @@ 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);