aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-16 14:02:11 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-17 11:09:52 -0500
commitce0e9f0ede349097c849db9c3aa7e947fc443552 (patch)
tree2e7668de5d1dfe91b4fa6c7988e9450d06bea6fd
parent5ac2ba9452b0a59df6cec10e8d27c52cf0b41a43 (diff)
ASoC: dapm: Unexport snd_soc_dapm_new_control()
Everything now uses snd_soc_dapm_new_controls() instead so we don't need to make it part of the external API. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
-rw-r--r--include/sound/soc-dapm.h2
-rw-r--r--sound/soc/soc-dapm.c5
2 files changed, 2 insertions, 5 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index db8435a79a82..c28d20b45669 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -352,8 +352,6 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
352 struct snd_ctl_elem_value *uncontrol); 352 struct snd_ctl_elem_value *uncontrol);
353int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, 353int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
354 struct snd_ctl_elem_value *uncontrol); 354 struct snd_ctl_elem_value *uncontrol);
355int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
356 const struct snd_soc_dapm_widget *widget);
357int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, 355int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
358 const struct snd_soc_dapm_widget *widget, 356 const struct snd_soc_dapm_widget *widget,
359 int num); 357 int num);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 0740cfc3d991..1bcce75058f7 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2707,8 +2707,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch);
2707 * 2707 *
2708 * Returns 0 for success else error. 2708 * Returns 0 for success else error.
2709 */ 2709 */
2710int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, 2710static int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
2711 const struct snd_soc_dapm_widget *widget) 2711 const struct snd_soc_dapm_widget *widget)
2712{ 2712{
2713 struct snd_soc_dapm_widget *w; 2713 struct snd_soc_dapm_widget *w;
2714 size_t name_len; 2714 size_t name_len;
@@ -2798,7 +2798,6 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
2798 w->connected = 1; 2798 w->connected = 1;
2799 return 0; 2799 return 0;
2800} 2800}
2801EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);
2802 2801
2803/** 2802/**
2804 * snd_soc_dapm_new_controls - create new dapm controls 2803 * snd_soc_dapm_new_controls - create new dapm controls