ASoC: s/w->kcontrols/w->kcontrol_news/g

A future change will modify struct snd_soc_dapm_widget to store the
actual kcontrol pointers for each kcontrol_new in a field named
kcontrols. Rename the existing kcontrols field to enable this.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 34 insertions, 34 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index f8a7c9a6f12a..76714be19e9d 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -39,30 +39,30 @@
 
 /* codec domain */
 #define SND_SOC_DAPM_VMID(wname) \
-{       .id = snd_soc_dapm_vmid, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_vmid, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0}
 
 /* platform domain */
 #define SND_SOC_DAPM_INPUT(wname) \
-{       .id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM }
 #define SND_SOC_DAPM_OUTPUT(wname) \
-{       .id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_output, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM }
 #define SND_SOC_DAPM_MIC(wname, wevent) \
-{       .id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_mic, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
         .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
 #define SND_SOC_DAPM_HP(wname, wevent) \
-{       .id = snd_soc_dapm_hp, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_hp, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
         .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
 #define SND_SOC_DAPM_SPK(wname, wevent) \
-{       .id = snd_soc_dapm_spk, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_spk, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
         .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
 #define SND_SOC_DAPM_LINE(wname, wevent) \
-{       .id = snd_soc_dapm_line, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_line, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
         .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
 
@@ -70,91 +70,91 @@
 #define SND_SOC_DAPM_PGA(wname, wreg, wshift, winvert,\
          wcontrols, wncontrols) \
 {       .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}
 #define SND_SOC_DAPM_OUT_DRV(wname, wreg, wshift, winvert,\
          wcontrols, wncontrols) \
 {       .id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}
 #define SND_SOC_DAPM_MIXER(wname, wreg, wshift, winvert, \
          wcontrols, wncontrols)\
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}
 #define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \
          wcontrols, wncontrols)\
 {       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \
-        .shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
+        .shift = wshift, .invert = winvert, .kcontrol_news = wcontrols, \
         .num_kcontrols = wncontrols}
 #define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \
 {       .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = NULL, .num_kcontrols = 0}
+        .invert = winvert, .kcontrol_news = NULL, .num_kcontrols = 0}
 #define SND_SOC_DAPM_SWITCH(wname, wreg, wshift, winvert, wcontrols) \
 {       .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1}
 #define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \
 {       .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1}
 #define SND_SOC_DAPM_VIRT_MUX(wname, wreg, wshift, winvert, wcontrols) \
 {       .id = snd_soc_dapm_virt_mux, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1}
 #define SND_SOC_DAPM_VALUE_MUX(wname, wreg, wshift, winvert, wcontrols) \
 {       .id = snd_soc_dapm_value_mux, .name = wname, .reg = wreg, \
-        .shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
+        .shift = wshift, .invert = winvert, .kcontrol_news = wcontrols, \
         .num_kcontrols = 1}
 
 /* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */
 #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
          wcontrols) \
 {       .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}
 #define SOC_MIXER_ARRAY(wname, wreg, wshift, winvert, \
          wcontrols)\
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}
 #define SOC_MIXER_NAMED_CTL_ARRAY(wname, wreg, wshift, winvert, \
          wcontrols)\
 {       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, .reg = wreg, \
-        .shift = wshift, .invert = winvert, .kcontrols = wcontrols, \
+        .shift = wshift, .invert = winvert, .kcontrol_news = wcontrols, \
         .num_kcontrols = ARRAY_SIZE(wcontrols)}
 
 /* path domain with event - event handler must return 0 for success */
 #define SND_SOC_DAPM_PGA_E(wname, wreg, wshift, winvert, wcontrols, \
         wncontrols, wevent, wflags) \
 {       .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \
         .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_OUT_DRV_E(wname, wreg, wshift, winvert, wcontrols, \
         wncontrols, wevent, wflags) \
 {       .id = snd_soc_dapm_out_drv, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \
         .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_MIXER_E(wname, wreg, wshift, winvert, wcontrols, \
         wncontrols, wevent, wflags) \
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = wncontrols, \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \
         .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \
         wcontrols, wncontrols, wevent, wflags) \
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, \
+        .invert = winvert, .kcontrol_news = wcontrols, \
         .num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_MICBIAS_E(wname, wreg, wshift, winvert, wevent, wflags) \
 {       .id = snd_soc_dapm_micbias, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = NULL, .num_kcontrols = 0, \
+        .invert = winvert, .kcontrol_news = NULL, .num_kcontrols = 0, \
         .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \
         wevent, wflags) \
 {       .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1, \
         .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
         wevent, wflags) \
 {       .id = snd_soc_dapm_mux, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1, \
         .event = wevent, .event_flags = wflags}
 #define SND_SOC_DAPM_VIRT_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
         wevent, wflags) \
 {       .id = snd_soc_dapm_virt_mux, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = 1, \
         .event = wevent, .event_flags = wflags}
 
 /* additional sequencing control within an event type */
@@ -173,26 +173,26 @@
 #define SOC_PGA_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
         wevent, wflags) \
 {       .id = snd_soc_dapm_pga, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
         .event = wevent, .event_flags = wflags}
 #define SOC_MIXER_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
         wevent, wflags) \
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
+        .invert = winvert, .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
         .event = wevent, .event_flags = wflags}
 #define SOC_MIXER_NAMED_CTL_E_ARRAY(wname, wreg, wshift, winvert, \
         wcontrols, wevent, wflags) \
 {       .id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \
-        .invert = winvert, .kcontrols = wcontrols, \
+        .invert = winvert, .kcontrol_news = wcontrols, \
         .num_kcontrols = ARRAY_SIZE(wcontrols), .event = wevent, .event_flags = wflags}
 
 /* events that are pre and post DAPM */
 #define SND_SOC_DAPM_PRE(wname, wevent) \
-{       .id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_pre, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
         .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}
 #define SND_SOC_DAPM_POST(wname, wevent) \
-{       .id = snd_soc_dapm_post, .name = wname, .kcontrols = NULL, \
+{       .id = snd_soc_dapm_post, .name = wname, .kcontrol_news = NULL, \
         .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
         .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}
 
@@ -232,7 +232,7 @@
 
 /* generic widgets */
 #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \
-{       .id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \
+{       .id = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \
         .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \
         .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \
         .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
@@ -473,7 +473,7 @@ struct snd_soc_dapm_widget {
 
         /* kcontrols that relate to this widget */
         int num_kcontrols;
-        const struct snd_kcontrol_new *kcontrols;
+        const struct snd_kcontrol_new *kcontrol_news;
 
         /* widget input and outputs */
         struct list_head sources;