diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-15 06:52:07 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-15 06:57:06 -0500 |
commit | b27727df32e5c44ad2e31326b148b5ba7823a370 (patch) | |
tree | c9237542fb71c4796bd23a972b975e1255cf1a62 /sound/soc/codecs | |
parent | a36ac9b32c1d653741f26e8ea3ed56e31fb6fe2f (diff) |
ASoC: twl6040: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
The codec field of the snd_soc_widget struct is eventually going to be
removed, use snd_soc_dapm_to_codec(w->dapm) instead.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/twl6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 90f47f988b3f..aeec27b6f1af 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c | |||
@@ -234,7 +234,7 @@ static int headset_power_mode(struct snd_soc_codec *codec, int high_perf) | |||
234 | static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w, | 234 | static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w, |
235 | struct snd_kcontrol *kcontrol, int event) | 235 | struct snd_kcontrol *kcontrol, int event) |
236 | { | 236 | { |
237 | struct snd_soc_codec *codec = w->codec; | 237 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
238 | u8 hslctl, hsrctl; | 238 | u8 hslctl, hsrctl; |
239 | 239 | ||
240 | /* | 240 | /* |
@@ -261,7 +261,7 @@ static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w, | |||
261 | static int twl6040_ep_drv_event(struct snd_soc_dapm_widget *w, | 261 | static int twl6040_ep_drv_event(struct snd_soc_dapm_widget *w, |
262 | struct snd_kcontrol *kcontrol, int event) | 262 | struct snd_kcontrol *kcontrol, int event) |
263 | { | 263 | { |
264 | struct snd_soc_codec *codec = w->codec; | 264 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
265 | struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); | 265 | struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); |
266 | int ret = 0; | 266 | int ret = 0; |
267 | 267 | ||