--- include/sound/soc-dapm.h

+++ include/sound/soc-dapm.h

@@ -46,25 +46,25 @@

/* platform domain */

#define SND_SOC_DAPM_INPUT(wname) \

{ .id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \

- .num_kcontrols = 0}

+ .num_kcontrols = 0, .reg = SND_SOC_NOPM }

#define SND_SOC_DAPM_OUTPUT(wname) \

{ .id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \

- .num_kcontrols = 0}

+ .num_kcontrols = 0, .reg = SND_SOC_NOPM }

#define SND_SOC_DAPM_MIC(wname, wevent) \

{ .id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \

- .num_kcontrols = 0, .event = wevent, \

+ .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, \

- .num_kcontrols = 0, .event = wevent, \

+ .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, \

- .num_kcontrols = 0, .event = wevent, \

+ .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, \

- .num_kcontrols = 0, .event = wevent, \

+ .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

/* path domain */

@@ -129,11 +129,11 @@

/* events that are pre and post DAPM */

#define SND_SOC_DAPM_PRE(wname, wevent) \

{ .id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \

- .num_kcontrols = 0, .event = wevent, \

+ .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, \

- .num_kcontrols = 0, .event = wevent, \

+ .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \

.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}

/* stream domain */