aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-20 15:05:39 -0500
committerMark Brown <broonie@kernel.org>2014-11-21 13:21:17 -0500
commit6e2793b98e23372cc80d9b5d981ab2467e90acea (patch)
tree8ec38be8a6106f96d8fdd25df7ba9d6c2e712af0 /sound/soc/codecs
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
ASoC: cs42l73: 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/cs42l73.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 2f8b94683e83..7c55537c69cf 100644
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -584,7 +584,7 @@ static const struct snd_kcontrol_new cs42l73_snd_controls[] = {
584static int cs42l73_spklo_spk_amp_event(struct snd_soc_dapm_widget *w, 584static int cs42l73_spklo_spk_amp_event(struct snd_soc_dapm_widget *w,
585 struct snd_kcontrol *kcontrol, int event) 585 struct snd_kcontrol *kcontrol, int event)
586{ 586{
587 struct snd_soc_codec *codec = w->codec; 587 struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
588 struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec); 588 struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
589 switch (event) { 589 switch (event) {
590 case SND_SOC_DAPM_POST_PMD: 590 case SND_SOC_DAPM_POST_PMD:
@@ -600,7 +600,7 @@ static int cs42l73_spklo_spk_amp_event(struct snd_soc_dapm_widget *w,
600static int cs42l73_ear_amp_event(struct snd_soc_dapm_widget *w, 600static int cs42l73_ear_amp_event(struct snd_soc_dapm_widget *w,
601 struct snd_kcontrol *kcontrol, int event) 601 struct snd_kcontrol *kcontrol, int event)
602{ 602{
603 struct snd_soc_codec *codec = w->codec; 603 struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
604 struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec); 604 struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
605 switch (event) { 605 switch (event) {
606 case SND_SOC_DAPM_POST_PMD: 606 case SND_SOC_DAPM_POST_PMD:
@@ -618,7 +618,7 @@ static int cs42l73_ear_amp_event(struct snd_soc_dapm_widget *w,
618static int cs42l73_hp_amp_event(struct snd_soc_dapm_widget *w, 618static int cs42l73_hp_amp_event(struct snd_soc_dapm_widget *w,
619 struct snd_kcontrol *kcontrol, int event) 619 struct snd_kcontrol *kcontrol, int event)
620{ 620{
621 struct snd_soc_codec *codec = w->codec; 621 struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
622 struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec); 622 struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec);
623 switch (event) { 623 switch (event) {
624 case SND_SOC_DAPM_POST_PMD: 624 case SND_SOC_DAPM_POST_PMD: