All of lore.kernel.org
 help / color / mirror / Atom feed
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 03/17] ASoC: arizona: Replace usage deprecated MUX/ENUM macros
Date: Mon, 14 Apr 2014 21:30:58 +0200	[thread overview]
Message-ID: <1397503872-20864-4-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1397503872-20864-1-git-send-email-lars@metafoo.de>

SND_SOC_DAPM_VALUE_MUX and SOC_DAPM_VALUE_ENUM 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/arizona.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 16df0f9..05ae17f 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -107,7 +107,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
 
 #define ARIZONA_MUX_CTL_DECL(name) \
 	const struct snd_kcontrol_new name##_mux =	\
-		SOC_DAPM_VALUE_ENUM("Route", name##_enum)
+		SOC_DAPM_ENUM("Route", name##_enum)
 
 #define ARIZONA_MUX_ENUMS(name, base_reg) \
 	static ARIZONA_MUX_ENUM_DECL(name##_enum, base_reg);      \
@@ -128,7 +128,7 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
 	ARIZONA_MUX_ENUMS(name##_aux6, base_reg + 40)
 
 #define ARIZONA_MUX(name, ctrl) \
-	SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
+	SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl)
 
 #define ARIZONA_MUX_WIDGETS(name, name_str) \
 	ARIZONA_MUX(name_str " Input", &name##_mux)
-- 
1.8.0

  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 ` Lars-Peter Clausen [this message]
2014-04-14 19:30 ` [PATCH 04/17] ASoC: max98090: " Lars-Peter Clausen
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-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.