Merge remote-tracking branch 'asoc/topic/core' into asoc-next (97c53e26) · Commits · e / devices / android_kernel_xiaomi_nabu

include/sound/soc.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -912,7 +912,7 @@ struct snd_soc_dai_link {
		* only for codec to codec links, or systems using device tree.
		*/
		const char *cpu_name;
		const struct device_node *cpu_of_node;
		struct device_node *cpu_of_node;
		/*
		* You MAY specify the DAI name of the CPU DAI. If this information is
		* omitted, the CPU-side DAI is matched using .cpu_name/.cpu_of_node
		@@ -924,7 +924,7 @@ struct snd_soc_dai_link {
		* DT/OF node, but not both.
		*/
		const char *codec_name;
		const struct device_node *codec_of_node;
		struct device_node *codec_of_node;
		/* You MUST specify the DAI name within the codec */
		const char *codec_dai_name;

		@@ -937,7 +937,7 @@ struct snd_soc_dai_link {
		* do not need a platform.
		*/
		const char *platform_name;
		const struct device_node *platform_of_node;
		struct device_node *platform_of_node;
		int be_id; /* optional ID for machine driver BE identification */

		const struct snd_soc_pcm_stream *params;

include/trace/events/asoc.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ TRACE_EVENT(snd_soc_dapm_output_path,
		__entry->path_sink = (long)path->sink;
		),

		TP_printk("%c%s -> %s -> %s\n",
		TP_printk("%c%s -> %s -> %s",
		(int) __entry->path_sink &&
		(int) __entry->path_connect ? '*' : ' ',
		__get_str(wname), __get_str(pname), __get_str(psname))
		@@ -204,7 +204,7 @@ TRACE_EVENT(snd_soc_dapm_input_path,
		__entry->path_source = (long)path->source;
		),

		TP_printk("%c%s <- %s <- %s\n",
		TP_printk("%c%s <- %s <- %s",
		(int) __entry->path_source &&
		(int) __entry->path_connect ? '*' : ' ',
		__get_str(wname), __get_str(pname), __get_str(psname))
		@@ -226,7 +226,7 @@ TRACE_EVENT(snd_soc_dapm_connected,
		__entry->stream = stream;
		),

		TP_printk("%s: found %d paths\n",
		TP_printk("%s: found %d paths",
		__entry->stream ? "capture" : "playback", __entry->paths)
		);

sound/soc/soc-core.c

+13 −17

Original line number	Diff line number	Diff line
		@@ -1956,19 +1956,14 @@ static struct platform_driver soc_driver = {
		int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
		struct snd_ac97_bus_ops *ops, int num)
		{
		mutex_lock(&codec->mutex);

		codec->ac97 = kzalloc(sizeof(struct snd_ac97), GFP_KERNEL);
		if (codec->ac97 == NULL) {
		mutex_unlock(&codec->mutex);
		if (codec->ac97 == NULL)
		return -ENOMEM;
		}

		codec->ac97->bus = kzalloc(sizeof(struct snd_ac97_bus), GFP_KERNEL);
		if (codec->ac97->bus == NULL) {
		kfree(codec->ac97);
		codec->ac97 = NULL;
		mutex_unlock(&codec->mutex);
		return -ENOMEM;
		}

		@@ -1981,7 +1976,6 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
		*/
		codec->ac97_created = 1;

		mutex_unlock(&codec->mutex);
		return 0;
		}
		EXPORT_SYMBOL_GPL(snd_soc_new_ac97_codec);
		@@ -2151,7 +2145,6 @@ EXPORT_SYMBOL_GPL(snd_soc_set_ac97_ops_of_reset);
		*/
		void snd_soc_free_ac97_codec(struct snd_soc_codec *codec)
		{
		mutex_lock(&codec->mutex);
		#ifdef CONFIG_SND_SOC_AC97_BUS
		soc_unregister_ac97_codec(codec);
		#endif
		@@ -2159,7 +2152,6 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec)
		kfree(codec->ac97);
		codec->ac97 = NULL;
		codec->ac97_created = 0;
		mutex_unlock(&codec->mutex);
		}
		EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec);

		@@ -2876,9 +2868,10 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
		unsigned int val, val_mask;
		int ret;

		val = ((ucontrol->value.integer.value[0] + min) & mask);
		if (invert)
		val = max - val;
		val = (max - ucontrol->value.integer.value[0]) & mask;
		else
		val = ((ucontrol->value.integer.value[0] + min) & mask);
		val_mask = mask << shift;
		val = val << shift;

		@@ -2887,9 +2880,10 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
		return ret;

		if (snd_soc_volsw_is_stereo(mc)) {
		val = ((ucontrol->value.integer.value[1] + min) & mask);
		if (invert)
		val = max - val;
		val = (max - ucontrol->value.integer.value[1]) & mask;
		else
		val = ((ucontrol->value.integer.value[1] + min) & mask);
		val_mask = mask << shift;
		val = val << shift;

		@@ -2934,6 +2928,7 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
		if (invert)
		ucontrol->value.integer.value[0] =
		max - ucontrol->value.integer.value[0];
		else
		ucontrol->value.integer.value[0] =
		ucontrol->value.integer.value[0] - min;

		@@ -2946,6 +2941,7 @@ int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol,
		if (invert)
		ucontrol->value.integer.value[1] =
		max - ucontrol->value.integer.value[1];
		else
		ucontrol->value.integer.value[1] =
		ucontrol->value.integer.value[1] - min;
		}