ASoC: wm_adsp: Account for name prefixes when toggling preloader

Use the correct functions to allow a name prefix assigned through
codec_conf to be taken into consideration whilst enabling and disabling
the preloader widget.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 82b0927..b7b9149 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2666,9 +2666,9 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,
        dsp->preloaded = ucontrol->value.integer.value[0];
 
        if (ucontrol->value.integer.value[0])
-               snd_soc_dapm_force_enable_pin(dapm, preload);
+               snd_soc_component_force_enable_pin(component, preload);
        else
-               snd_soc_dapm_disable_pin(dapm, preload);
+               snd_soc_component_disable_pin(component, preload);
 
        snd_soc_dapm_sync(dapm);
 
@@ -2852,11 +2852,11 @@ EXPORT_SYMBOL_GPL(wm_adsp2_event);
 
 int wm_adsp2_component_probe(struct wm_adsp *dsp, struct snd_soc_component *component)
 {
-       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
        char preload[32];
 
        snprintf(preload, ARRAY_SIZE(preload), "DSP%d Preload", dsp->num);
-       snd_soc_dapm_disable_pin(dapm, preload);
+
+       snd_soc_component_disable_pin(component, preload);
 
        wm_adsp2_init_debugfs(dsp, component);