openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: adau1977: Replace direct snd_soc_codec dapm field access 

The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to
codec->dapm.bias_level with  snd_soc_codec_get_bias_level() and all
remaining access to codec->dapm with snd_soc_codec_get_dapm().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2015-05-04 18:46:10 +02:00 committed by Mark Brown
parent b787f68c36
commit f21d1e22ee
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/adau1977.c
View File

@ -485,7 +485,7 @@ static int adau1977_set_bias_level(struct snd_soc_codec *codec,
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF)
ret = adau1977_power_enable(adau1977); ret = adau1977_power_enable(adau1977);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
@ -853,12 +853,13 @@ static int adau1977_set_sysclk(struct snd_soc_codec *codec,
static int adau1977_codec_probe(struct snd_soc_codec *codec) static int adau1977_codec_probe(struct snd_soc_codec *codec)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct adau1977 *adau1977 = snd_soc_codec_get_drvdata(codec); struct adau1977 *adau1977 = snd_soc_codec_get_drvdata(codec);
int ret; int ret;
switch (adau1977->type) { switch (adau1977->type) {
case ADAU1977: case ADAU1977:
ret = snd_soc_dapm_new_controls(&codec->dapm, ret = snd_soc_dapm_new_controls(dapm,
adau1977_micbias_dapm_widgets, adau1977_micbias_dapm_widgets,
ARRAY_SIZE(adau1977_micbias_dapm_widgets)); ARRAY_SIZE(adau1977_micbias_dapm_widgets));
if (ret < 0) if (ret < 0)