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

Commit 21efde50 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_simple_widgets 



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

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

include/sound/soc.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -1649,12 +1649,8 @@ void snd_soc_util_exit(void); 
int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,

int snd_soc_of_parse_card_name_from_node(struct snd_soc_card *card,

					 struct device_node *np,

					 struct device_node *np,

					 const char *propname);

					 const char *propname);

#define snd_soc_of_parse_audio_simple_widgets(card, propname)\

int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,

	snd_soc_of_parse_audio_simple_widgets_from_node(card, NULL, propname)

int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card,

						    struct device_node *np,

					  const char *propname);

					  const char *propname);



int snd_soc_of_parse_tdm_slot(struct device_node *np,

int snd_soc_of_parse_tdm_slot(struct device_node *np,

			      unsigned int *tx_mask,

			      unsigned int *tx_mask,

			      unsigned int *rx_mask,

			      unsigned int *rx_mask,

sound/soc/soc-core.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -3530,17 +3530,14 @@ static const struct snd_soc_dapm_widget simple_widgets[] = { 
	SND_SOC_DAPM_SPK("Speaker", NULL),

	SND_SOC_DAPM_SPK("Speaker", NULL),

};

};





int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card,

int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,

					  struct device_node *np,

					  const char *propname)

					  const char *propname)

{

{

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

	struct snd_soc_dapm_widget *widgets;

	struct snd_soc_dapm_widget *widgets;

	const char *template, *wname;

	const char *template, *wname;

	int i, j, num_widgets, ret;

	int i, j, num_widgets, ret;





	if (!np)

		np = card->dev->of_node;



	num_widgets = of_property_count_strings(np, propname);

	num_widgets = of_property_count_strings(np, propname);

	if (num_widgets < 0) {

	if (num_widgets < 0) {

		dev_err(card->dev,

		dev_err(card->dev,
@@ -3611,7 +3608,7 @@ int snd_soc_of_parse_audio_simple_widgets_from_node(struct snd_soc_card *card, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets_from_node);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets);





static int snd_soc_of_get_slot_mask(struct device_node *np,

static int snd_soc_of_get_slot_mask(struct device_node *np,

				    const char *prop_name,

				    const char *prop_name,