aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-06-01 04:11:06 -0400
committerMark Brown <broonie@kernel.org>2015-06-01 11:46:02 -0400
commit4a6c2aa19d5b6dcd6078d1e0db2a88407b926ded (patch)
tree9b486e851288adb2eaa4e43476279fa0b738d711
parent718e23fde529cf7f4f945606217e49c5f2e31537 (diff)
ASoC: wm_hubs: 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 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/wm_hubs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 8366e19657a7..fd86bd105460 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -1116,7 +1116,7 @@ static const struct snd_soc_dapm_route lineout2_se_routes[] = {
1116 1116
1117int wm_hubs_add_analogue_controls(struct snd_soc_codec *codec) 1117int wm_hubs_add_analogue_controls(struct snd_soc_codec *codec)
1118{ 1118{
1119 struct snd_soc_dapm_context *dapm = &codec->dapm; 1119 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
1120 1120
1121 /* Latch volume update bits & default ZC on */ 1121 /* Latch volume update bits & default ZC on */
1122 snd_soc_update_bits(codec, WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 1122 snd_soc_update_bits(codec, WM8993_LEFT_LINE_INPUT_1_2_VOLUME,
@@ -1160,7 +1160,7 @@ int wm_hubs_add_analogue_routes(struct snd_soc_codec *codec,
1160 int lineout1_diff, int lineout2_diff) 1160 int lineout1_diff, int lineout2_diff)
1161{ 1161{
1162 struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); 1162 struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
1163 struct snd_soc_dapm_context *dapm = &codec->dapm; 1163 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
1164 1164
1165 hubs->codec = codec; 1165 hubs->codec = codec;
1166 1166