diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-04-14 15:31:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-14 15:40:05 -0400 |
commit | 7eb364ab196d522cdde744010c4e02c2fe62f6fc (patch) | |
tree | 881a8ba0e4daa3d9549067903084e7251b39083d | |
parent | 712fb1c27dce4e3fe9338f27ed0f8684fe9d5597 (diff) |
ASoC: wm2200: Replace usage deprecated MUX/ENUM macros
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>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/wm2200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 2e721e06671b..cdea9d9c1631 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
@@ -1083,7 +1083,7 @@ static int wm2200_mixer_values[] = { | |||
1083 | 1083 | ||
1084 | #define WM2200_MUX_CTL_DECL(name) \ | 1084 | #define WM2200_MUX_CTL_DECL(name) \ |
1085 | const struct snd_kcontrol_new name##_mux = \ | 1085 | const struct snd_kcontrol_new name##_mux = \ |
1086 | SOC_DAPM_VALUE_ENUM("Route", name##_enum) | 1086 | SOC_DAPM_ENUM("Route", name##_enum) |
1087 | 1087 | ||
1088 | #define WM2200_MIXER_ENUMS(name, base_reg) \ | 1088 | #define WM2200_MIXER_ENUMS(name, base_reg) \ |
1089 | static WM2200_MUX_ENUM_DECL(name##_in1_enum, base_reg); \ | 1089 | static WM2200_MUX_ENUM_DECL(name##_in1_enum, base_reg); \ |
@@ -1207,7 +1207,7 @@ WM2200_MIXER_ENUMS(LHPF1, WM2200_LHPF1MIX_INPUT_1_SOURCE); | |||
1207 | WM2200_MIXER_ENUMS(LHPF2, WM2200_LHPF2MIX_INPUT_1_SOURCE); | 1207 | WM2200_MIXER_ENUMS(LHPF2, WM2200_LHPF2MIX_INPUT_1_SOURCE); |
1208 | 1208 | ||
1209 | #define WM2200_MUX(name, ctrl) \ | 1209 | #define WM2200_MUX(name, ctrl) \ |
1210 | SND_SOC_DAPM_VALUE_MUX(name, SND_SOC_NOPM, 0, 0, ctrl) | 1210 | SND_SOC_DAPM_MUX(name, SND_SOC_NOPM, 0, 0, ctrl) |
1211 | 1211 | ||
1212 | #define WM2200_MIXER_WIDGETS(name, name_str) \ | 1212 | #define WM2200_MIXER_WIDGETS(name, name_str) \ |
1213 | WM2200_MUX(name_str " Input 1", &name##_in1_mux), \ | 1213 | WM2200_MUX(name_str " Input 1", &name##_in1_mux), \ |