From: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: "Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Pierre-Louis Bossart" <pierre-louis.bossart@linux.intel.com>,
"Jie Yang" <yang.jie@linux.intel.com>,
"Cezary Rojewski" <cezary.rojewski@intel.com>,
linux-kernel@vger.kernel.org,
"Amadeusz Sławiński" <amadeuszx.slawinski@intel.com>
Subject: [PATCH 3/6] ASoC: dapm: Expose snd_soc_dapm_new_control_unlocked properly
Date: Tue, 27 Aug 2019 16:17:09 +0200 [thread overview]
Message-ID: <20190827141712.21015-4-amadeuszx.slawinski@linux.intel.com> (raw)
In-Reply-To: <20190827141712.21015-1-amadeuszx.slawinski@linux.intel.com>
From: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
We use snd_soc_dapm_new_control_unlocked for topology and have local
declaration, instead declare it properly in header like already declared
snd_soc_dapm_new_control.
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@intel.com>
---
include/sound/soc-dapm.h | 3 +++
sound/soc/soc-topology.c | 6 ------
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 2aa73d6dd7be..30d8d0410952 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -404,6 +404,9 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
struct snd_soc_dapm_widget *snd_soc_dapm_new_control(
struct snd_soc_dapm_context *dapm,
const struct snd_soc_dapm_widget *widget);
+struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked(
+ struct snd_soc_dapm_context *dapm,
+ const struct snd_soc_dapm_widget *widget);
int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
struct snd_soc_dai *dai);
int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index b8690715abb5..aa9a1fca46fa 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -80,12 +80,6 @@ struct soc_tplg {
static int soc_tplg_process_headers(struct soc_tplg *tplg);
static void soc_tplg_complete(struct soc_tplg *tplg);
-struct snd_soc_dapm_widget *
-snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
- const struct snd_soc_dapm_widget *widget);
-struct snd_soc_dapm_widget *
-snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
- const struct snd_soc_dapm_widget *widget);
static void soc_tplg_denum_remove_texts(struct soc_enum *se);
static void soc_tplg_denum_remove_values(struct soc_enum *se);
--
2.17.1
next prev parent reply other threads:[~2019-08-27 14:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 14:17 [PATCH 0/6] Small fixes Amadeusz Sławiński
2019-08-27 14:17 ` [PATCH 1/6] ASoC: Intel: Skylake: Use correct function to access iomem space Amadeusz Sławiński
2019-08-27 14:17 ` [PATCH 2/6] ASoC: Intel: Fix use of potentially uninitialized variable Amadeusz Sławiński
2019-08-27 19:18 ` Cezary Rojewski
2019-08-27 14:17 ` Amadeusz Sławiński [this message]
2019-08-27 14:17 ` [PATCH 4/6] ASoC: Intel: Skylake: Print module type instead of id Amadeusz Sławiński
2019-08-27 14:17 ` [PATCH 5/6] ASoC: Intel: Skylake: Release topology when we are done with it Amadeusz Sławiński
2019-08-27 14:17 ` [PATCH 6/6] ASoC: Intel: NHLT: Fix debug print format Amadeusz Sławiński
2019-08-27 14:58 ` [alsa-devel] [PATCH 0/6] Small fixes Pierre-Louis Bossart
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=20190827141712.21015-4-amadeuszx.slawinski@linux.intel.com \
--to=amadeuszx.slawinski@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
--cc=yang.jie@linux.intel.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
all inboxes | Powered by JetHome®