ASoC: Add a set_bias_level() callback to the DAPM context struct

Currently the DAPM code directly looks at the CODEC driver struct to get a
handle to the set_bias_level() callback. This patch adds a new set_bias_level()
callback to the DAPM context struct. The DAPM code will use this new callback
instead of the CODEC callback. For CODECs the new callback is set up to call the
CODEC specific set_bias_level callback(). Not looking directly at the CODEC
driver struct will allow non CODEC DAPM contexts to implement a set_bias_level()
callback.

This is also similar to how the seq_notifier() and stream_event() callbacks are
currently handled.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8db627cc2fbe681963293e2f296c05621a291f2b..3a5c4f969c04165399c98c2e86d6340fb71f5620 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -601,6 +601,8 @@ struct snd_soc_dapm_context {
        struct list_head list;
 
        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
+       int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
+                             enum snd_soc_bias_level level);
 
 #ifdef CONFIG_DEBUG_FS
        struct dentry *debugfs_dapm;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bca8a7150a4aeaf4a2096afe9a83d93236f24e91..10e13c43bc54a9d7e568a7ac54ff42f9526d624f 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4285,6 +4285,14 @@ static int snd_soc_codec_drv_read(struct snd_soc_component *component,
        return 0;
 }
 
+static int snd_soc_codec_set_bias_level(struct snd_soc_dapm_context *dapm,
+       enum snd_soc_bias_level level)
+{
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
+
+       return codec->driver->set_bias_level(codec, level);
+}
+
 /**
  * snd_soc_register_codec - Register a codec with the ASoC core
  *
@@ -4322,6 +4330,8 @@ int snd_soc_register_codec(struct device *dev,
        codec->dapm.component = &codec->component;
        codec->dapm.seq_notifier = codec_drv->seq_notifier;
        codec->dapm.stream_event = codec_drv->stream_event;
+       if (codec_drv->set_bias_level)
+               codec->dapm.set_bias_level = snd_soc_codec_set_bias_level;
        codec->dev = dev;
        codec->driver = codec_drv;
        codec->component.val_bytes = codec_drv->reg_word_size;

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index fab1a8813abf0ad1273be98759a538a088f4c20f..6c94a6b3fce75a8e6a8e53a604a76f1bdd994c05 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -427,15 +427,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
        if (ret != 0)
                goto out;
 
-       if (dapm->codec) {
-               if (dapm->codec->driver->set_bias_level)
-                       ret = dapm->codec->driver->set_bias_level(dapm->codec,
-                                                                 level);
-               else
-                       dapm->bias_level = level;
-       } else if (!card || dapm != &card->dapm) {
+       if (dapm->set_bias_level)
+               ret = dapm->set_bias_level(dapm, level);
+       else if (!card || dapm != &card->dapm)
                dapm->bias_level = level;
-       }
 
        if (ret != 0)
                goto out;