ASoC: wm8731: 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 replace all other manual access to codec->dapm with snd_soc_codec_get_dapm(). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
5e80bb92f2
commit
fc31fda63b
@ -387,6 +387,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||||||
int clk_id, unsigned int freq, int dir)
|
int clk_id, unsigned int freq, int dir)
|
||||||
{
|
{
|
||||||
struct snd_soc_codec *codec = codec_dai->codec;
|
struct snd_soc_codec *codec = codec_dai->codec;
|
||||||
|
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
|
||||||
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
|
struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
|
||||||
|
|
||||||
switch (clk_id) {
|
switch (clk_id) {
|
||||||
@ -421,7 +422,7 @@ static int wm8731_set_dai_sysclk(struct snd_soc_dai *codec_dai,
|
|||||||
|
|
||||||
wm8731->sysclk = freq;
|
wm8731->sysclk = freq;
|
||||||
|
|
||||||
snd_soc_dapm_sync(&codec->dapm);
|
snd_soc_dapm_sync(dapm);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -501,7 +502,7 @@ static int wm8731_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 = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies),
|
ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies),
|
||||||
wm8731->supplies);
|
wm8731->supplies);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user