ASoC: wm8993: 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:
Родитель
bfdd20a497
Коммит
f8ae3cf81f
|
@ -992,7 +992,7 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
|
|||
break;
|
||||
|
||||
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(wm8993->supplies),
|
||||
wm8993->supplies);
|
||||
if (ret != 0)
|
||||
|
@ -1483,7 +1483,7 @@ static struct snd_soc_dai_driver wm8993_dai = {
|
|||
static int wm8993_probe(struct snd_soc_codec *codec)
|
||||
{
|
||||
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
|
||||
struct snd_soc_dapm_context *dapm = &codec->dapm;
|
||||
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
|
||||
|
||||
wm8993->hubs_data.hp_startup_mode = 1;
|
||||
wm8993->hubs_data.dcs_codes_l = -2;
|
||||
|
@ -1537,7 +1537,7 @@ static int wm8993_probe(struct snd_soc_codec *codec)
|
|||
* VMID as an output and can disable it.
|
||||
*/
|
||||
if (wm8993->pdata.lineout1_diff && wm8993->pdata.lineout2_diff)
|
||||
codec->dapm.idle_bias_off = 1;
|
||||
dapm->idle_bias_off = 1;
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче