aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-24 21:51:25 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 15:13:35 +0000
commit3d23c73fa0a47e8aecd2a4d8f280f45f6f7611a1 (patch)
treedb430cf4190c1f76f9af884533c4d72c55c04794
parent181e055e6bed80afbf8ba2bb5e3ce84fbd3f633c (diff)
downloadkernel_samsung_smdk4412-3d23c73fa0a47e8aecd2a4d8f280f45f6f7611a1.zip
kernel_samsung_smdk4412-3d23c73fa0a47e8aecd2a4d8f280f45f6f7611a1.tar.gz
kernel_samsung_smdk4412-3d23c73fa0a47e8aecd2a4d8f280f45f6f7611a1.tar.bz2
ASoC: Remove controls from sequenced PGA arguments
We have zero users for PGA controls and the core support for them was removed a while ago so no point in cut'n'pasting them into new macros, even if it's too much hassle to update the existing ones. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--include/sound/soc-dapm.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 6c9ae23..6a25e69 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -158,11 +158,11 @@
.event = wevent, .event_flags = wflags}
/* additional sequencing control within an event type */
-#define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, wcontrols, \
- wncontrols, wevent, wflags) \
+#define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \
+ wevent, wflags) \
{ .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
- .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
- .event = wevent, .event_flags = wflags, .subseq = wsubseq}
+ .invert = winvert, .event = wevent, .event_flags = wflags, \
+ .subseq = wsubseq}
#define SND_SOC_DAPM_SUPPLY_S(wname, wsubseq, wreg, wshift, winvert, wevent, \
wflags) \
{ .id = snd_soc_dapm_supply, .name = wname, .reg = wreg, \