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/wm8350.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/wm8350.c')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 757256bf7672..42a72b2404d5 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -302,7 +302,7 @@ static int pga_event(struct snd_soc_dapm_widget *w, | |||
302 | static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol, | 302 | static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol, |
303 | struct snd_ctl_elem_value *ucontrol) | 303 | struct snd_ctl_elem_value *ucontrol) |
304 | { | 304 | { |
305 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 305 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
306 | struct wm8350_data *wm8350_priv = snd_soc_codec_get_drvdata(codec); | 306 | struct wm8350_data *wm8350_priv = snd_soc_codec_get_drvdata(codec); |
307 | struct wm8350_output *out = NULL; | 307 | struct wm8350_output *out = NULL; |
308 | struct soc_mixer_control *mc = | 308 | struct soc_mixer_control *mc = |
@@ -345,7 +345,7 @@ static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol, | |||
345 | static int wm8350_get_volsw_2r(struct snd_kcontrol *kcontrol, | 345 | static int wm8350_get_volsw_2r(struct snd_kcontrol *kcontrol, |
346 | struct snd_ctl_elem_value *ucontrol) | 346 | struct snd_ctl_elem_value *ucontrol) |
347 | { | 347 | { |
348 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 348 | struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); |
349 | struct wm8350_data *wm8350_priv = snd_soc_codec_get_drvdata(codec); | 349 | struct wm8350_data *wm8350_priv = snd_soc_codec_get_drvdata(codec); |
350 | struct wm8350_output *out1 = &wm8350_priv->out1; | 350 | struct wm8350_output *out1 = &wm8350_priv->out1; |
351 | struct wm8350_output *out2 = &wm8350_priv->out2; | 351 | struct wm8350_output *out2 = &wm8350_priv->out2; |