Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.11

Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.

1 files changed, 32 insertions, 34 deletions

diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 2f70ea7f6618..f52eab6d2231 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -142,13 +142,12 @@ static void tegra20_ac97_codec_write(struct snd_ac97 *ac97_snd,
         } while (!time_after(jiffies, timeout));
 }
 
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops tegra20_ac97_ops = {
         .read           = tegra20_ac97_codec_read,
         .write          = tegra20_ac97_codec_write,
         .reset          = tegra20_ac97_codec_reset,
         .warm_reset     = tegra20_ac97_codec_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 static inline void tegra20_ac97_start_playback(struct tegra20_ac97 *ac97)
 {
@@ -327,7 +326,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
         }
         dev_set_drvdata(&pdev->dev, ac97);
 
-        ac97->clk_ac97 = clk_get(&pdev->dev, NULL);
+        ac97->clk_ac97 = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(ac97->clk_ac97)) {
                 dev_err(&pdev->dev, "Can't retrieve ac97 clock\n");
                 ret = PTR_ERR(ac97->clk_ac97);
@@ -341,18 +340,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
                 goto err_clk_put;
         }
 
-        memregion = devm_request_mem_region(&pdev->dev, mem->start,
-                                            resource_size(mem), DRV_NAME);
-        if (!memregion) {
-                dev_err(&pdev->dev, "Memory region already claimed\n");
-                ret = -EBUSY;
-                goto err_clk_put;
-        }
-
-        regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-        if (!regs) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                ret = -ENOMEM;
+        regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(regs)) {
+                ret = PTR_ERR(regs);
+                dev_err(&pdev->dev, "ioremap failed: %d\n", ret);
                 goto err_clk_put;
         }
 
@@ -403,23 +394,9 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
         ac97->capture_dma_data.maxburst = 4;
         ac97->capture_dma_data.slave_id = of_dma[0];
 
-        ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
-                                         &tegra20_ac97_dai, 1);
-        if (ret) {
-                dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
-                ret = -ENOMEM;
-                goto err_clk_put;
-        }
-
-        ret = tegra_pcm_platform_register(&pdev->dev);
-        if (ret) {
-                dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-                goto err_unregister_component;
-        }
-
         ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);
         if (ret)
-                goto err_unregister_pcm;
+                goto err_clk_put;
 
         ret = tegra_asoc_utils_set_ac97_rate(&ac97->util_data);
         if (ret)
@@ -431,20 +408,40 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
                 goto err_asoc_utils_fini;
         }
 
+        ret = snd_soc_set_ac97_ops(&tegra20_ac97_ops);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto err_asoc_utils_fini;
+        }
+
+        ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
+                                         &tegra20_ac97_dai, 1);
+        if (ret) {
+                dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
+                ret = -ENOMEM;
+                goto err_asoc_utils_fini;
+        }
+
+        ret = tegra_pcm_platform_register(&pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
+                goto err_unregister_component;
+        }
+
         /* XXX: crufty ASoC AC97 API - only one AC97 codec allowed */
         workdata = ac97;
 
         return 0;
 
-err_asoc_utils_fini:
-        tegra_asoc_utils_fini(&ac97->util_data);
 err_unregister_pcm:
         tegra_pcm_platform_unregister(&pdev->dev);
 err_unregister_component:
         snd_soc_unregister_component(&pdev->dev);
+err_asoc_utils_fini:
+        tegra_asoc_utils_fini(&ac97->util_data);
 err_clk_put:
-        clk_put(ac97->clk_ac97);
 err:
+        snd_soc_set_ac97_ops(NULL);
         return ret;
 }
 
@@ -458,7 +455,8 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
         tegra_asoc_utils_fini(&ac97->util_data);
 
         clk_disable_unprepare(ac97->clk_ac97);
-        clk_put(ac97->clk_ac97);
+
+        snd_soc_set_ac97_ops(NULL);
 
         return 0;
 }