Unverified Commit 2c7b1704 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_of_xlate_dai_id() 



Current ALSA SoC is directly using component->driver->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_of_xlate_dai_id() and use it.

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


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -358,5 +358,7 @@ void snd_soc_component_resume(struct snd_soc_component *component); 
int snd_soc_component_is_suspended(struct snd_soc_component *component);

int snd_soc_component_probe(struct snd_soc_component *component);

void snd_soc_component_remove(struct snd_soc_component *component);

int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,

				      struct device_node *ep);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+9 −0
Original line number Diff line number Diff line
@@ -380,3 +380,12 @@ void snd_soc_component_remove(struct snd_soc_component *component) 
	if (component->driver->remove)

		component->driver->remove(component);

}



int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,

				      struct device_node *ep)

{

	if (component->driver->of_xlate_dai_id)

		return component->driver->of_xlate_dai_id(component, ep);



	return -ENOTSUPP;

}

sound/soc/soc-core.c

+2 −3
Original line number Diff line number Diff line
@@ -3334,9 +3334,8 @@ int snd_soc_get_dai_id(struct device_node *ep) 
	ret = -ENOTSUPP;

	mutex_lock(&client_mutex);

	component = soc_find_component(&dlc);

	if (component &&

	    component->driver->of_xlate_dai_id)

		ret = component->driver->of_xlate_dai_id(component, ep);

	if (component)

		ret = snd_soc_component_of_xlate_dai_id(component, ep);

	mutex_unlock(&client_mutex);



	of_node_put(dlc.of_node);

CRA Git | Maintained and supported by SUSTech CRA and CCSE