Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca03cd7 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Explicitly say registerless widgets have no register 



This stops code that handles widgets generically from attempting to access
registers for these widgets.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Cc: stable@kernel.org
parent 333802e9

include/sound/soc-dapm.h

+8 −8
Original line number Original line Diff line number Diff line
@@ -45,25 +45,25 @@ 
/* platform domain */

/* platform domain */

#define SND_SOC_DAPM_INPUT(wname) \

#define SND_SOC_DAPM_INPUT(wname) \

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

{	.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) \

#define SND_SOC_DAPM_OUTPUT(wname) \

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

{	.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) \

#define SND_SOC_DAPM_MIC(wname, wevent) \

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

{	.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}

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}

#define SND_SOC_DAPM_HP(wname, wevent) \

#define SND_SOC_DAPM_HP(wname, wevent) \

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

{	.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}

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_SPK(wname, wevent) \

#define SND_SOC_DAPM_SPK(wname, wevent) \

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

{	.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}

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_LINE(wname, wevent) \

#define SND_SOC_DAPM_LINE(wname, wevent) \

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

{	.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}

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}





/* path domain */

/* path domain */
@@ -189,11 +189,11 @@ 
/* events that are pre and post DAPM */

/* events that are pre and post DAPM */

#define SND_SOC_DAPM_PRE(wname, wevent) \

#define SND_SOC_DAPM_PRE(wname, wevent) \

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

{	.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}

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}

#define SND_SOC_DAPM_POST(wname, wevent) \

#define SND_SOC_DAPM_POST(wname, wevent) \

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

{	.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}

	.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}





/* stream domain */

/* stream domain */