Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: soc-core: remove OF adjusting for snd_soc_of_parse_audio_routing 



Because prototype of OF-graph sound card support didn't have Sound Card
node, commit 7364c8dc
("ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_routing")
adjusted to it on each functions.

But final discussion result of ALSA SoC / OF-graph ML, OF-graph sound
card has node. Thus, this commit became no longer needed.

This reverts commit 7364c8dc.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

include/sound/soc.h

+2 −7
Original line number Diff line number Diff line
@@ -1668,13 +1668,8 @@ void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card, 
				   struct snd_soc_codec_conf *codec_conf,

				   struct device_node *of_node,

				   const char *propname);



#define snd_soc_of_parse_audio_routing(card, propname) \

	snd_soc_of_parse_audio_routing_from_node(card, NULL, propname)

int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,

					     struct device_node *np,

int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,

				   const char *propname);



unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix,

				     struct device_node **bitclkmaster,

sound/soc/soc-core.c

+3 −6
Original line number Diff line number Diff line
@@ -3690,17 +3690,14 @@ void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);



int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card,

				   struct device_node *np,

int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,

				   const char *propname)

{

	struct device_node *np = card->dev->of_node;

	int num_routes;

	struct snd_soc_dapm_route *routes;

	int i, ret;



	if (!np)

		np = card->dev->of_node;



	num_routes = of_property_count_strings(np, propname);

	if (num_routes < 0 || num_routes & 1) {

		dev_err(card->dev,
@@ -3747,7 +3744,7 @@ int snd_soc_of_parse_audio_routing_from_node(struct snd_soc_card *card, 


	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing_from_node);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing);



unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix,