diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-03-18 04:02:04 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-14 12:22:43 -0400 |
commit | ea53bf77d147e7e560ac007fdaa30fb98c37c712 (patch) | |
tree | fb5917764aa5b2c0f4122708097446c3110541a0 /sound/soc/codecs/wm8983.c | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
ASoC: Add snd_soc_kcontrol_codec() helper function
For CODEC controls snd_kcontrol_chip() currently returns a pointer to the
CODEC that registered the control. With the upcoming consolidation of
platform and CODEC controls this will change. Prepare for this by introducing
the snd_soc_kcontrol_codec() helper function that will hide the implementation
details of how the CODEC for a control can be obtained. This will allow us to
change this easily in the future.
The patch also updates all CODEC drivers to use the new helper function.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm8983.c')
-rw-r--r-- | sound/soc/codecs/wm8983.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index 2b9bfa53efbf..19d5baa38f5c 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c | |||
@@ -552,7 +552,7 @@ static const struct snd_soc_dapm_route wm8983_audio_map[] = { | |||
552 | static int eqmode_get(struct snd_kcontrol *kcontrol, | 552 | static int eqmode_get(struct snd_kcontrol *kcontrol, |
553 | struct snd_ctl_elem_value *ucontrol) | 553 | struct snd_ctl_elem_value *ucontrol) |
554 | { | 554 | { |
555 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 555 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
556 | unsigned int reg; | 556 | unsigned int reg; |
557 | 557 | ||
558 | reg = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF); | 558 | reg = snd_soc_read(codec, WM8983_EQ1_LOW_SHELF); |
@@ -567,7 +567,7 @@ static int eqmode_get(struct snd_kcontrol *kcontrol, | |||
567 | static int eqmode_put(struct snd_kcontrol *kcontrol, | 567 | static int eqmode_put(struct snd_kcontrol *kcontrol, |
568 | struct snd_ctl_elem_value *ucontrol) | 568 | struct snd_ctl_elem_value *ucontrol) |
569 | { | 569 | { |
570 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 570 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
571 | unsigned int regpwr2, regpwr3; | 571 | unsigned int regpwr2, regpwr3; |
572 | unsigned int reg_eq; | 572 | unsigned int reg_eq; |
573 | 573 | ||