ASoC: ac97: Support multi-platform AC'97

Currently we can only have a single platform built in with AC'97 support
due to the use of a global variable to provide the bus operations. Fix
this by making that variable a pointer and having the bus drivers set the
operations prior to registering.

This is not a particularly good or nice approach but it avoids blocking
multiplatform and a real fix involves fixing the fairly deep problems
with AC'97 support - we should be converting it to a real bus.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 9 insertions, 3 deletions

diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 04d7fd461484..2dd623fa3882 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -214,13 +214,12 @@ static irqreturn_t s3c_ac97_irq(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops s3c_ac97_ops = {
         .read       = s3c_ac97_read,
         .write      = s3c_ac97_write,
         .warm_reset = s3c_ac97_warm_reset,
         .reset      = s3c_ac97_cold_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 static int s3c_ac97_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *params,
@@ -452,6 +451,12 @@ static int s3c_ac97_probe(struct platform_device *pdev)
                 goto err4;
         }
 
+        ret = snd_soc_set_ac97_ops(&s3c_ac97_ops);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto err4;
+        }
+
         ret = snd_soc_register_component(&pdev->dev, &s3c_ac97_component,
                                          s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));
         if (ret)
@@ -472,7 +477,7 @@ err4:
 err3:
         clk_disable_unprepare(s3c_ac97.ac97_clk);
 err2:
-
+        snd_soc_set_ac97_ops(NULL);
         return ret;
 }
 
@@ -488,6 +493,7 @@ static int s3c_ac97_remove(struct platform_device *pdev)
                 free_irq(irq_res->start, NULL);
 
         clk_disable_unprepare(s3c_ac97.ac97_clk);
+        snd_soc_set_ac97_ops(NULL);
 
         return 0;
 }