From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org,
"Lars-Peter Clausen" <lars@metafoo.de>,
patches@opensource.wolfsonmicro.com,
"Philippe Rétornaz" <philippe.retornaz@epfl.ch>,
"Bard Liao" <bardliao@realtek.com>,
"Charles Keepax" <ckeepax@opensource.wolfsonmicro.com>,
"Jerry Wong" <jerry.wong@maximintegrated.com>
Subject: [PATCH 04/17] ASoC: max98090: Replace usage deprecated MUX/ENUM macros
Date: Mon, 14 Apr 2014 21:30:59 +0200 [thread overview]
Message-ID: <1397503872-20864-5-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1397503872-20864-1-git-send-email-lars@metafoo.de>
SND_SOC_DAPM_VIRT_MUX and SOC_DAPM_ENUM_VIRT are deprecated and merely an alias
for SND_SOC_DAPM_MUX and SOC_DAPM_ENUM. Replace the deprecated macros so we can
eventually remove their definition.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/codecs/max98090.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 49d1238..810d42f 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -875,7 +875,7 @@ static const char *dmic_mux_text[] = { "ADC", "DMIC" };
static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);
static const struct snd_kcontrol_new max98090_dmic_mux =
- SOC_DAPM_ENUM_VIRT("DMIC Mux", dmic_mux_enum);
+ SOC_DAPM_ENUM("DMIC Mux", dmic_mux_enum);
static const char *max98090_micpre_text[] = { "Off", "On" };
@@ -1175,8 +1175,7 @@ static const struct snd_soc_dapm_widget max98090_dapm_widgets[] = {
SND_SOC_DAPM_MUX("MIC2 Mux", SND_SOC_NOPM,
0, 0, &max98090_mic2_mux),
- SND_SOC_DAPM_VIRT_MUX("DMIC Mux", SND_SOC_NOPM,
- 0, 0, &max98090_dmic_mux),
+ SND_SOC_DAPM_MUX("DMIC Mux", SND_SOC_NOPM, 0, 0, &max98090_dmic_mux),
SND_SOC_DAPM_PGA_E("MIC1 Input", M98090_REG_MIC1_INPUT_LEVEL,
M98090_MIC_PA1EN_SHIFT, 0, NULL, 0, max98090_micinput_event,
--
1.8.0
next prev parent reply other threads:[~2014-04-14 19:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 19:30 [PATCH 00/17] Removed deprecated ENUM/MUX macros Lars-Peter Clausen
2014-04-14 19:30 ` [PATCH 01/17] ASoC: adau1373: Replace usage deprecated MUX/ENUM macros Lars-Peter Clausen
2014-04-14 19:30 ` [PATCH 02/17] ASoC: adav80x: " Lars-Peter Clausen
2014-04-14 19:30 ` [PATCH 03/17] ASoC: arizona: " Lars-Peter Clausen
2014-04-14 19:30 ` Lars-Peter Clausen [this message]
2014-04-14 19:31 ` [PATCH 05/17] ASoC: mc13783: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 06/17] ASoC: pcm512x: Replace usage deprecated SOC_VALUE_ENUM macro Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 07/17] ASoC: rt5640: Replace usage deprecated MUX/ENUM macros Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 08/17] ASoC: wm2200: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 09/17] ASoC: wm5100: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 10/17] ASoC: wm5102: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 11/17] ASoC: wm5110: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 12/17] ASoC: wm8988: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 13/17] ASoC: wm5102: Replace usage deprecated SOC_VALUE_ENUM macro Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 14/17] ASoC: wm8994: Replace usage deprecated MUX/ENUM macros Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 15/17] ASoC: wm8995: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 16/17] ASoC: wm8997: " Lars-Peter Clausen
2014-04-14 19:31 ` [PATCH 17/17] ASoC: Remove deprecated ENUM/MUX macros Lars-Peter Clausen
2014-04-14 19:40 ` [PATCH 00/17] Removed " Mark Brown
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=1397503872-20864-5-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=bardliao@realtek.com \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=jerry.wong@maximintegrated.com \
--cc=lgirdwood@gmail.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=philippe.retornaz@epfl.ch \
/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