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, 15 insertions, 14 deletions

diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index c66bef826ac5..efb1daecd0dd 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -198,13 +198,12 @@ static void bf5xx_ac97_cold_reset(struct snd_ac97 *ac97)
 #endif
 }
 
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops bf5xx_ac97_ops = {
         .read   = bf5xx_ac97_read,
         .write  = bf5xx_ac97_write,
         .warm_reset     = bf5xx_ac97_warm_reset,
         .reset  = bf5xx_ac97_cold_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 #ifdef CONFIG_PM
 static int bf5xx_ac97_suspend(struct snd_soc_dai *dai)
@@ -293,13 +292,14 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
 
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
         /* Request PB3 as reset pin */
-        if (gpio_request(CONFIG_SND_BF5XX_RESET_GPIO_NUM, "SND_AD198x RESET")) {
-                pr_err("Failed to request GPIO_%d for reset\n",
-                                CONFIG_SND_BF5XX_RESET_GPIO_NUM);
-                ret =  -1;
+        ret = devm_gpio_request_one(&pdev->dev,
+                                    CONFIG_SND_BF5XX_RESET_GPIO_NUM,
+                                    GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") {
+                dev_err(&pdev->dev,
+                        "Failed to request GPIO_%d for reset: %d\n",
+                        CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret);
                 goto gpio_err;
         }
-        gpio_direction_output(CONFIG_SND_BF5XX_RESET_GPIO_NUM, 1);
 #endif
 
         sport_handle = sport_init(pdev, 2, sizeof(struct ac97_frame),
@@ -335,6 +335,12 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
                 goto sport_config_err;
         }
 
+        ret = snd_soc_set_ac97_ops(&bf5xx_ac97_ops);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto sport_config_err;
+        }
+
         ret = snd_soc_register_component(&pdev->dev, &bfin_ac97_component,
                                          &bfin_ac97_dai, 1);
         if (ret) {
@@ -349,10 +355,7 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev)
 sport_config_err:
         sport_done(sport_handle);
 sport_err:
-#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
-        gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
-gpio_err:
-#endif
+        snd_soc_set_ac97_ops(NULL);
 
         return ret;
 }
@@ -363,9 +366,7 @@ static int asoc_bfin_ac97_remove(struct platform_device *pdev)
 
         snd_soc_unregister_component(&pdev->dev);
         sport_done(sport_handle);
-#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
-        gpio_free(CONFIG_SND_BF5XX_RESET_GPIO_NUM);
-#endif
+        snd_soc_set_ac97_ops(NULL);
 
         return 0;
 }