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

Commit b07609ce 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_card_name 



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

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

include/sound/soc.h

+2 −5
Original line number Diff line number Diff line
@@ -1644,10 +1644,7 @@ static inline struct snd_soc_platform *snd_soc_kcontrol_platform( 
int snd_soc_util_init(void);

void snd_soc_util_exit(void);



#define snd_soc_of_parse_card_name(card, propname) \

	snd_soc_of_parse_card_name_from_node(card, NULL, propname)

int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,

					 struct device_node *np,

int snd_soc_of_parse_card_name(struct snd_soc_card *card,

			       const char *propname);

int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,

					  const char *propname);

sound/soc/soc-core.c

+5 −6
Original line number Diff line number Diff line
@@ -3492,10 +3492,10 @@ void snd_soc_unregister_codec(struct device *dev) 
EXPORT_SYMBOL_GPL(snd_soc_unregister_codec);



/* Retrieve a card's name from device tree */

int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,

					 struct device_node *np,

int snd_soc_of_parse_card_name(struct snd_soc_card *card,

			       const char *propname)

{

	struct device_node *np;

	int ret;



	if (!card->dev) {
@@ -3503,7 +3503,6 @@ int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, 
		return -EINVAL;

	}



	if (!np)

	np = card->dev->of_node;



	ret = of_property_read_string_index(np, propname, 0, &card->name);
@@ -3521,7 +3520,7 @@ int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card, 


	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name_from_node);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_card_name);



static const struct snd_soc_dapm_widget simple_widgets[] = {

	SND_SOC_DAPM_MIC("Microphone", NULL),