Fix compilation issues by using the snd_soc_dapm_context pointer whenever it is required.
Signed-off-by: Dimitris Papastamos dp@opensource.wolfsonmicro.com --- sound/soc/codecs/tlv320aic32x4.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index ee82e38..c6c3520 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -340,13 +340,15 @@ static inline int aic32x4_get_divs(int mclk, int rate)
static int aic32x4_add_widgets(struct snd_soc_codec *codec) { - snd_soc_dapm_new_controls(codec, aic32x4_dapm_widgets, + struct snd_soc_dapm_context *dapm = &codec->dapm; + + snd_soc_dapm_new_controls(dapm, aic32x4_dapm_widgets, ARRAY_SIZE(aic32x4_dapm_widgets));
- snd_soc_dapm_add_routes(codec, aic32x4_dapm_routes, + snd_soc_dapm_add_routes(dapm, aic32x4_dapm_routes, ARRAY_SIZE(aic32x4_dapm_routes));
- snd_soc_dapm_new_widgets(codec); + snd_soc_dapm_new_widgets(dapm); return 0; }
@@ -602,7 +604,7 @@ static int aic32x4_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_OFF: break; } - codec->bias_level = level; + codec->dapm.bias_level = level; return 0; }