aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2014-09-19 07:16:05 -0400
committerMark Brown <broonie@kernel.org>2014-10-02 14:13:12 -0400
commit5dc0158a27f65e7efaa6e3cc496d93b4c4c65d19 (patch)
tree0e8a28c4f028bd9f8eba4eb08e363521a4772b2e
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
ASoC: Export dapm_kcontrol_get_value
The DSP driver needs to know widget control value in its event handler for widgets like mixers. This is required in the subsequent patches Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--include/sound/soc-dapm.h1
-rw-r--r--sound/soc/soc-dapm.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index aac04ff84eea..6ae0a1952ad7 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -432,6 +432,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
432int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, 432int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
433 const char *pin); 433 const char *pin);
434void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card); 434void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card);
435unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);
435 436
436/* Mostly internal - should not normally be used */ 437/* Mostly internal - should not normally be used */
437void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm); 438void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 8348352dc2c6..08c79f09034f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -326,12 +326,13 @@ static struct list_head *dapm_kcontrol_get_path_list(
326 list_for_each_entry(path, dapm_kcontrol_get_path_list(kcontrol), \ 326 list_for_each_entry(path, dapm_kcontrol_get_path_list(kcontrol), \
327 list_kcontrol) 327 list_kcontrol)
328 328
329static unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol) 329unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol)
330{ 330{
331 struct dapm_kcontrol_data *data = snd_kcontrol_chip(kcontrol); 331 struct dapm_kcontrol_data *data = snd_kcontrol_chip(kcontrol);
332 332
333 return data->value; 333 return data->value;
334} 334}
335EXPORT_SYMBOL_GPL(dapm_kcontrol_get_value);
335 336
336static bool dapm_kcontrol_set_value(const struct snd_kcontrol *kcontrol, 337static bool dapm_kcontrol_set_value(const struct snd_kcontrol *kcontrol,
337 unsigned int value) 338 unsigned int value)