Unverified Commit 10e83409 authored Jun 25, 2020 by Tzung-Bi Shih Committed by Mark Brown Jun 25, 2020

ASoC: core: move definition of enum snd_soc_bias_level



To fix compilation error:

- error: field 'XXX' has incomplete type

Moves definition of enum snd_soc_bias_level from soc.h to soc-dapm.h.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20200625153543.85039-2-tzungbi@google.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 6f81e520

include/sound/soc-dapm.h

+18 −0

Original line number	Diff line number	Diff line
		@@ -376,6 +376,24 @@ struct snd_soc_dapm_widget_list;
		struct snd_soc_dapm_update;
		enum snd_soc_dapm_direction;

		/*
		* Bias levels
		*
		* @ON: Bias is fully on for audio playback and capture operations.
		* @PREPARE: Prepare for audio operations. Called before DAPM switching for
		* stream start and stop operations.
		* @STANDBY: Low power standby state when no playback/capture operations are
		* in progress. NOTE: The transition time between STANDBY and ON
		* should be as fast as possible and no longer than 10ms.
		* @OFF: Power Off. No restrictions on transition times.
		*/
		enum snd_soc_bias_level {
		SND_SOC_BIAS_OFF = 0,
		SND_SOC_BIAS_STANDBY = 1,
		SND_SOC_BIAS_PREPARE = 2,
		SND_SOC_BIAS_ON = 3,
		};

		int dapm_regulator_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event);
		int dapm_clock_event(struct snd_soc_dapm_widget *w,

include/sound/soc.h

+0 −18

Original line number	Diff line number	Diff line
		@@ -368,24 +368,6 @@
		#define SOC_ENUM_SINGLE_VIRT_DECL(name, xtexts) \
		const struct soc_enum name = SOC_ENUM_SINGLE_VIRT(ARRAY_SIZE(xtexts), xtexts)

		/*
		* Bias levels
		*
		* @ON: Bias is fully on for audio playback and capture operations.
		* @PREPARE: Prepare for audio operations. Called before DAPM switching for
		* stream start and stop operations.
		* @STANDBY: Low power standby state when no playback/capture operations are
		* in progress. NOTE: The transition time between STANDBY and ON
		* should be as fast as possible and no longer than 10ms.
		* @OFF: Power Off. No restrictions on transition times.
		*/
		enum snd_soc_bias_level {
		SND_SOC_BIAS_OFF = 0,
		SND_SOC_BIAS_STANDBY = 1,
		SND_SOC_BIAS_PREPARE = 2,
		SND_SOC_BIAS_ON = 3,
		};

		struct device_node;
		struct snd_jack;
		struct snd_soc_card;