Unverified Commit 01e90ee1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_is_codec() 



Checking .non_legacy_dai_naming is not readable.
Let's add new snd_soc_component_is_codec().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h7dft7dn.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 86e4aef6

include/sound/soc-component.h

+5 −0
Original line number Diff line number Diff line
@@ -333,6 +333,11 @@ static inline int snd_soc_component_cache_sync( 
	return regcache_sync(component->regmap);

}



static inline int snd_soc_component_is_codec(struct snd_soc_component *component)

{

	return component->driver->non_legacy_dai_naming;

}



void snd_soc_component_set_aux(struct snd_soc_component *component,

			       struct snd_soc_aux_dev *aux);

int snd_soc_component_init(struct snd_soc_component *component);

sound/soc/generic/simple-card-utils.c

+2 −2
Original line number Diff line number Diff line
@@ -355,9 +355,9 @@ static int asoc_simple_init_dai_link_params(struct snd_soc_pcm_runtime *rtd, 
	struct snd_pcm_hardware hw;

	int i, ret, stream;



	/* Only codecs should have non_legacy_dai_naming set. */

	/* Only Codecs */

	for_each_rtd_components(rtd, i, component) {

		if (!component->driver->non_legacy_dai_naming)

		if (!snd_soc_component_is_codec(component))

			return 0;

	}

sound/soc/soc-core.c

+2 −3
Original line number Diff line number Diff line
@@ -1247,14 +1247,13 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 


	/*

	 * Flip the polarity for the "CPU" end of a CODEC<->CODEC link

	 * the component which has non_legacy_dai_naming is Codec

	 */

	inv_dai_fmt = snd_soc_daifmt_clock_provider_fliped(dai_fmt);



	for_each_rtd_cpu_dais(rtd, i, cpu_dai) {

		unsigned int fmt = dai_fmt;



		if (cpu_dai->component->driver->non_legacy_dai_naming)

		if (snd_soc_component_is_codec(cpu_dai->component))

			fmt = inv_dai_fmt;



		ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
@@ -2521,7 +2520,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component, 


	for (i = 0; i < count; i++) {

		dai = snd_soc_register_dai(component, dai_drv + i, count == 1 &&

				  !component->driver->non_legacy_dai_naming);

					   !snd_soc_component_is_codec(component));

		if (dai == NULL) {

			ret = -ENOMEM;

			goto err;