diff options
author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2014-06-11 07:50:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-11 19:35:22 -0400 |
commit | 5c3fc7a79aae474670096d73da21aec9f0750abb (patch) | |
tree | 61e642ceb04b5066a9915375b7f6819d0ef88858 | |
parent | cc9e92431ee9c7fe974266e0e6533a1a68e45539 (diff) |
ASoC: wm5102: Convert snd_kcontrol_chip to snd_soc_kcontrol_codec
Controls for shaping the ultrasonic frequency response were introduced
in this commit:
commit 720630c002ffc7b0fa2ed5b3f4bfb36fd8f87ca6
ASoC: wm5102: Add controls to allow shaping of ultrasonic response
However, they mistakenly used snd_kcontrol_chip instead of
snd_soc_kcontrol_codec, which has replaced it now the framework is
moving to componentisation. This patch fixes this.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/wm5102.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 7bf2397fc25a..58913580cc5a 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c | |||
@@ -615,7 +615,7 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w, | |||
615 | static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol, | 615 | static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol, |
616 | struct snd_ctl_elem_value *ucontrol) | 616 | struct snd_ctl_elem_value *ucontrol) |
617 | { | 617 | { |
618 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 618 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
619 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); | 619 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); |
620 | uint16_t data; | 620 | uint16_t data; |
621 | 621 | ||
@@ -630,7 +630,7 @@ static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol, | |||
630 | static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol, | 630 | static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol, |
631 | struct snd_ctl_elem_value *ucontrol) | 631 | struct snd_ctl_elem_value *ucontrol) |
632 | { | 632 | { |
633 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 633 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
634 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); | 634 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); |
635 | 635 | ||
636 | mutex_lock(&codec->mutex); | 636 | mutex_lock(&codec->mutex); |
@@ -645,7 +645,7 @@ static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol, | |||
645 | static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, | 645 | static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, |
646 | struct snd_ctl_elem_value *ucontrol) | 646 | struct snd_ctl_elem_value *ucontrol) |
647 | { | 647 | { |
648 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 648 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
649 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); | 649 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); |
650 | 650 | ||
651 | mutex_lock(&codec->mutex); | 651 | mutex_lock(&codec->mutex); |
@@ -658,7 +658,7 @@ static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, | |||
658 | static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol, | 658 | static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol, |
659 | struct snd_ctl_elem_value *ucontrol) | 659 | struct snd_ctl_elem_value *ucontrol) |
660 | { | 660 | { |
661 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 661 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
662 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); | 662 | struct arizona *arizona = dev_get_drvdata(codec->dev->parent); |
663 | 663 | ||
664 | mutex_lock(&codec->mutex); | 664 | mutex_lock(&codec->mutex); |