ASoC: tegra20: i2s: Remove handing of disabled runtime PM

[linux-2.6-microblaze.git] / sound / soc / tegra / tegra20_i2s.c

diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index fe56919..1b27f81 100644 (file)
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -401,18 +401,13 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
        i2s->playback_dma_data.maxburst = 4;
 
        pm_runtime_enable(&pdev->dev);
-       if (!pm_runtime_enabled(&pdev->dev)) {
-               ret = tegra20_i2s_runtime_resume(&pdev->dev);
-               if (ret)
-                       goto err_pm_disable;
-       }
 
        ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,
                                         &i2s->dai, 1);
        if (ret) {
                dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
                ret = -ENOMEM;
-               goto err_suspend;
+               goto err_pm_disable;
        }
 
        ret = tegra_pcm_platform_register(&pdev->dev);
@@ -425,9 +420,6 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
 
 err_unregister_component:
        snd_soc_unregister_component(&pdev->dev);
-err_suspend:
-       if (!pm_runtime_status_suspended(&pdev->dev))
-               tegra20_i2s_runtime_suspend(&pdev->dev);
 err_pm_disable:
        pm_runtime_disable(&pdev->dev);
 err:
@@ -438,10 +430,7 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev)
 {
        tegra_pcm_platform_unregister(&pdev->dev);
        snd_soc_unregister_component(&pdev->dev);
-
        pm_runtime_disable(&pdev->dev);
-       if (!pm_runtime_status_suspended(&pdev->dev))
-               tegra20_i2s_runtime_suspend(&pdev->dev);
 
        return 0;
 }