alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Liam Girdwood <lrg@ti.com>
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 2/8] ASoC: dapm: Unexport snd_soc_dapm_new_control()
Date: Thu, 16 Feb 2012 21:56:04 -0800	[thread overview]
Message-ID: <1329458170-22119-2-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1329458170-22119-1-git-send-email-broonie@opensource.wolfsonmicro.com>

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>
---
 include/sound/soc-dapm.h |    2 --
 sound/soc/soc-dapm.c     |    5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index db8435a..c28d20b 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,
 	struct snd_ctl_elem_value *uncontrol);
 int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *uncontrol);
-int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
-	const struct snd_soc_dapm_widget *widget);
 int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
 	const struct snd_soc_dapm_widget *widget,
 	int num);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d3f6bad0..c7032fa 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2710,8 +2710,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch);
  *
  * Returns 0 for success else error.
  */
-int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
-	const struct snd_soc_dapm_widget *widget)
+static int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
+				    const struct snd_soc_dapm_widget *widget)
 {
 	struct snd_soc_dapm_widget *w;
 	size_t name_len;
@@ -2801,7 +2801,6 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 	w->connected = 1;
 	return 0;
 }
-EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control);
 
 /**
  * snd_soc_dapm_new_controls - create new dapm controls
-- 
1.7.9.rc1

  reply	other threads:[~2012-02-17  5:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-17  5:56 [PATCH 1/8] ALSA: core: Constify the name in new kcontrols Mark Brown
2012-02-17  5:56 ` Mark Brown [this message]
2012-02-17  5:56 ` [PATCH 3/8] ASoC: dapm: Refactor snd_soc_dapm_new_widget() to return the widget Mark Brown
2012-02-17  5:56 ` [PATCH 4/8] ASoC: dapm: Supply the DAI and substream when calling stream events Mark Brown
2012-02-17  5:56 ` [PATCH 5/8] ASoC: dapm: Constify lots of names that are never modified Mark Brown
2012-02-17  5:56 ` [PATCH 6/8] ASoC: dapm: Implement and instantiate DAI widgets Mark Brown
2012-02-17  8:40   ` Vinod Koul
2012-02-17 10:39     ` Liam Girdwood
2012-02-22 12:35     ` Vinod Koul
2012-02-22 12:43       ` Mark Brown
2012-02-22 13:01         ` Vinod Koul
2012-02-22 13:29           ` Mark Brown
2012-02-23  6:50             ` Vinod Koul
2012-02-23 15:25               ` Mark Brown
2012-02-17  5:56 ` [PATCH 7/8] ASoC: dapm: Convert stream events to use " Mark Brown
2012-02-17  5:56 ` [PATCH 8/8] ASoC: wm8994: Convert to use DAI widget routing rather than streams Mark Brown
2012-02-17  9:50 ` [PATCH 1/8] ALSA: core: Constify the name in new kcontrols Liam Girdwood

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1329458170-22119-2-git-send-email-broonie@opensource.wolfsonmicro.com \
    --to=broonie@opensource.wolfsonmicro.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=lrg@ti.com \
    --cc=patches@opensource.wolfsonmicro.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).