Commit 440a3006 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_prefix 



Because prototype of OF-graph sound card support didn't have Sound Card
node, commit b6defcca
("ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_prefix")
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 b6defcca.

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

include/sound/soc.h

+1 −5
Original line number Diff line number Diff line
@@ -1656,11 +1656,7 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, 
			      unsigned int *rx_mask,

			      unsigned int *slots,

			      unsigned int *slot_width);

#define snd_soc_of_parse_audio_prefix(card, codec_conf, of_node, propname) \

	snd_soc_of_parse_audio_prefix_from_node(card, NULL, codec_conf, \

						of_node, propname)

void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,

				   struct device_node *np,

void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,

				   struct snd_soc_codec_conf *codec_conf,

				   struct device_node *of_node,

				   const char *propname);

sound/soc/soc-core.c

+3 −6
Original line number Diff line number Diff line
@@ -3664,18 +3664,15 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, 
}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_tdm_slot);



void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card,

				   struct device_node *np,

void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,

				   struct snd_soc_codec_conf *codec_conf,

				   struct device_node *of_node,

				   const char *propname)

{

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

	const char *str;

	int ret;



	if (!np)

		np = card->dev->of_node;



	ret = of_property_read_string(np, propname, &str);

	if (ret < 0) {

		/* no prefix is not error */
@@ -3685,7 +3682,7 @@ void snd_soc_of_parse_audio_prefix_from_node(struct snd_soc_card *card, 
	codec_conf->of_node	= of_node;

	codec_conf->name_prefix	= str;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix_from_node);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_prefix);



int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,

				   const char *propname)

CRA Git | Maintained and supported by SUSTech CRA and CCSE