aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-06-01 04:10:59 -0400
committerMark Brown <broonie@kernel.org>2015-06-01 11:45:35 -0400
commitf8ae3cf81fb866a0d91e3319f53d6ed0a599616e (patch)
tree2e39c262859a084da758613ab3449d2a1317fea8
parentbfdd20a4979a5815e4175c896dd7f0ad63bc78db (diff)
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>
-rw-r--r--sound/soc/codecs/wm8993.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 52ec4fe03b23..8a8db8605dc2 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -992,7 +992,7 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
992 break; 992 break;
993 993
994 case SND_SOC_BIAS_STANDBY: 994 case SND_SOC_BIAS_STANDBY:
995 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { 995 if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
996 ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies), 996 ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies),
997 wm8993->supplies); 997 wm8993->supplies);
998 if (ret != 0) 998 if (ret != 0)
@@ -1483,7 +1483,7 @@ static struct snd_soc_dai_driver wm8993_dai = {
1483static int wm8993_probe(struct snd_soc_codec *codec) 1483static int wm8993_probe(struct snd_soc_codec *codec)
1484{ 1484{
1485 struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); 1485 struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
1486 struct snd_soc_dapm_context *dapm = &codec->dapm; 1486 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
1487 1487
1488 wm8993->hubs_data.hp_startup_mode = 1; 1488 wm8993->hubs_data.hp_startup_mode = 1;
1489 wm8993->hubs_data.dcs_codes_l = -2; 1489 wm8993->hubs_data.dcs_codes_l = -2;
@@ -1537,7 +1537,7 @@ static int wm8993_probe(struct snd_soc_codec *codec)
1537 * VMID as an output and can disable it. 1537 * VMID as an output and can disable it.
1538 */ 1538 */
1539 if (wm8993->pdata.lineout1_diff && wm8993->pdata.lineout2_diff) 1539 if (wm8993->pdata.lineout1_diff && wm8993->pdata.lineout2_diff)
1540 codec->dapm.idle_bias_off = 1; 1540 dapm->idle_bias_off = 1;
1541 1541
1542 return 0; 1542 return 0;
1543 1543