ASoC: Pass component instead of DAPM context to AUX dev init callback

Given that the component is the containing structure it makes more sense to pass
the component rather than the DAPM context to the AUX dev init callback.

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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index fbc2ad840244c52ab32f23fe34aac9921523f297..3a0031e1f9b41df825f0e92b8f6e0653b6618856 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1022,7 +1022,7 @@ struct snd_soc_aux_dev {
        const struct device_node *codec_of_node;
 
        /* codec/machine specific init - e.g. add machine controls */
-       int (*init)(struct snd_soc_dapm_context *dapm);
+       int (*init)(struct snd_soc_component *component);
 };
 
 /* SoC card */

diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 9902efcb8ea121a99a930816d727c11c1f614258..a05482651aaeaf5c1ff994de194d65a63857191d 100644 (file)
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -228,10 +228,12 @@ static struct snd_soc_dai_link speyside_dai[] = {
        },
 };
 
-static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm)
+static int speyside_wm9081_init(struct snd_soc_component *component)
 {
+       struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
+
        /* At any time the WM9081 is active it will have this clock */
-       return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0,
+       return snd_soc_codec_set_sysclk(codec, WM9081_SYSCLK_MCLK, 0,
                                        MCLK_AUDIO_RATE, 0);
 }
 

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 08c04f4c7e62d35aa180df97dd955d608957d46e..4393bc33d3afce323267af4799d1bf91bd3c262d 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1632,7 +1632,7 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num)
 
        /* do machine specific initialization */
        if (aux_dev->init) {
-               ret = aux_dev->init(snd_soc_component_get_dapm(rtd->component));
+               ret = aux_dev->init(rtd->component);
                if (ret < 0) {
                        dev_err(card->dev, "ASoC: failed to init %s: %d\n",
                                aux_dev->name, ret);