diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-13 04:27:15 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-14 14:53:06 -0500 |
commit | c3495aea5de1ad14e0ffdb8ade4d263afd73babb (patch) | |
tree | 1ef29c4f1959336e8d75f31274acf4941d61e0a0 | |
parent | d286b805e74a95390bc917b1b0ab508e27eda7d7 (diff) |
ASoC: wm8770: 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>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/wm8770.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 180e7a098726..53e977da2f86 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c | |||
@@ -308,9 +308,7 @@ static const struct snd_soc_dapm_route wm8770_intercon[] = { | |||
308 | static int vout12supply_event(struct snd_soc_dapm_widget *w, | 308 | static int vout12supply_event(struct snd_soc_dapm_widget *w, |
309 | struct snd_kcontrol *kcontrol, int event) | 309 | struct snd_kcontrol *kcontrol, int event) |
310 | { | 310 | { |
311 | struct snd_soc_codec *codec; | 311 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
312 | |||
313 | codec = w->codec; | ||
314 | 312 | ||
315 | switch (event) { | 313 | switch (event) { |
316 | case SND_SOC_DAPM_PRE_PMU: | 314 | case SND_SOC_DAPM_PRE_PMU: |
@@ -327,9 +325,7 @@ static int vout12supply_event(struct snd_soc_dapm_widget *w, | |||
327 | static int vout34supply_event(struct snd_soc_dapm_widget *w, | 325 | static int vout34supply_event(struct snd_soc_dapm_widget *w, |
328 | struct snd_kcontrol *kcontrol, int event) | 326 | struct snd_kcontrol *kcontrol, int event) |
329 | { | 327 | { |
330 | struct snd_soc_codec *codec; | 328 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
331 | |||
332 | codec = w->codec; | ||
333 | 329 | ||
334 | switch (event) { | 330 | switch (event) { |
335 | case SND_SOC_DAPM_PRE_PMU: | 331 | case SND_SOC_DAPM_PRE_PMU: |