diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-04-14 15:31:12 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-14 15:40:06 -0400 |
commit | 785b3c4e0951252cdbc0cd902292bf5c9f08897a (patch) | |
tree | e5863dc6706ac03f041503004dcd20de02a6adc9 /include/sound/soc-dapm.h | |
parent | e13dd8ce39a89c7a7d8ec025b266337b42eeaafc (diff) |
ASoC: Remove deprecated ENUM/MUX macros
Since there are no users left, we can remove the deprecated ENUM and MUX macros
which are just alias for other macros.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r-- | include/sound/soc-dapm.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index ef78f562f4a8..5ec03b5e2054 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -107,10 +107,6 @@ struct device; | |||
107 | { .id = snd_soc_dapm_mux, .name = wname, \ | 107 | { .id = snd_soc_dapm_mux, .name = wname, \ |
108 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ | 108 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ |
109 | .kcontrol_news = wcontrols, .num_kcontrols = 1} | 109 | .kcontrol_news = wcontrols, .num_kcontrols = 1} |
110 | #define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \ | ||
111 | SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) | ||
112 | #define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \ | ||
113 | SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) | ||
114 | 110 | ||
115 | /* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */ | 111 | /* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */ |
116 | #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\ | 112 | #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\ |
@@ -166,10 +162,6 @@ struct device; | |||
166 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ | 162 | SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ |
167 | .kcontrol_news = wcontrols, .num_kcontrols = 1, \ | 163 | .kcontrol_news = wcontrols, .num_kcontrols = 1, \ |
168 | .event = wevent, .event_flags = wflags} | 164 | .event = wevent, .event_flags = wflags} |
169 | #define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ | ||
170 | wevent, wflags) \ | ||
171 | SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, wevent, \ | ||
172 | wflags) | ||
173 | 165 | ||
174 | /* additional sequencing control within an event type */ | 166 | /* additional sequencing control within an event type */ |
175 | #define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \ | 167 | #define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \ |
@@ -305,16 +297,12 @@ struct device; | |||
305 | .get = snd_soc_dapm_get_enum_double, \ | 297 | .get = snd_soc_dapm_get_enum_double, \ |
306 | .put = snd_soc_dapm_put_enum_double, \ | 298 | .put = snd_soc_dapm_put_enum_double, \ |
307 | .private_value = (unsigned long)&xenum } | 299 | .private_value = (unsigned long)&xenum } |
308 | #define SOC_DAPM_ENUM_VIRT(xname, xenum) \ | ||
309 | SOC_DAPM_ENUM(xname, xenum) | ||
310 | #define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \ | 300 | #define SOC_DAPM_ENUM_EXT(xname, xenum, xget, xput) \ |
311 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 301 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
312 | .info = snd_soc_info_enum_double, \ | 302 | .info = snd_soc_info_enum_double, \ |
313 | .get = xget, \ | 303 | .get = xget, \ |
314 | .put = xput, \ | 304 | .put = xput, \ |
315 | .private_value = (unsigned long)&xenum } | 305 | .private_value = (unsigned long)&xenum } |
316 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ | ||
317 | SOC_DAPM_ENUM(xname, xenum) | ||
318 | #define SOC_DAPM_PIN_SWITCH(xname) \ | 306 | #define SOC_DAPM_PIN_SWITCH(xname) \ |
319 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \ | 307 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname " Switch", \ |
320 | .info = snd_soc_dapm_info_pin_switch, \ | 308 | .info = snd_soc_dapm_info_pin_switch, \ |