Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next (77b62fa5) · Commits · e / devices / android_kernel_teracube_2e

include/sound/soc-dapm.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -440,7 +440,6 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card);
		int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
		struct snd_soc_dapm_widget_list **list);

		struct snd_soc_codec snd_soc_dapm_kcontrol_codec(struct snd_kcontrol kcontrol);
		struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(
		struct snd_kcontrol *kcontrol);

+13 −0

Original line number	Diff line number	Diff line
		@@ -1268,6 +1268,19 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
		return component->dapm_ptr;
		}

		/**
		* snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol
		* @kcontrol: The kcontrol
		*
		* This function must only be used on DAPM contexts that are known to be part of
		* a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.
		*/
		static inline struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(
		struct snd_kcontrol *kcontrol)
		{
		return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));
		}

		/* codec IO */
		unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
		int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,

+0 −10

Original line number	Diff line number	Diff line
		@@ -473,16 +473,6 @@ struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(
		}
		EXPORT_SYMBOL_GPL(snd_soc_dapm_kcontrol_dapm);

		/**
		* snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol
		* @kcontrol: The kcontrol
		*/
		struct snd_soc_codec snd_soc_dapm_kcontrol_codec(struct snd_kcontrol kcontrol)
		{
		return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));
		}
		EXPORT_SYMBOL_GPL(snd_soc_dapm_kcontrol_codec);

		static void dapm_reset(struct snd_soc_card *card)
		{
		struct snd_soc_dapm_widget *w;