Merge tag 'asoc-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
[muen/linux.git] / sound / soc / codecs / wm_adsp.c
index af062c4f4017ec55d6f72f7e2f8565e09bc7a989..2175dccdf38891045d89212f5f60aa18c19f2807 100644 (file)
@@ -2665,9 +2665,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);
 
@@ -2851,11 +2851,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);