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

Unverified Commit 33404f3f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple_card_utils: remove "option" from asoc_simple_card_of_parse_routing() 



asoc_simple_card_of_parse_routing() had "option" parameter
to consider error handling, but it is very pointless parameter.
Let's remove it.

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

include/sound/simple_card_utils.h

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ void asoc_simple_card_parse_convert(struct device *dev, 
				    struct asoc_simple_card_data *data);



int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,

				      char *prefix,

				      int optional);

				      char *prefix);

int asoc_simple_card_of_parse_widgets(struct snd_soc_card *card,

				      char *prefix);

sound/soc/generic/audio-graph-card.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	if (ret < 0)

		return ret;



	ret = asoc_simple_card_of_parse_routing(card, NULL, 1);

	ret = asoc_simple_card_of_parse_routing(card, NULL);

	if (ret < 0)

		return ret;

sound/soc/generic/audio-graph-scu-card.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) 
	 * see simple-card

	 */



	ret = asoc_simple_card_of_parse_routing(card, NULL, 0);

	ret = asoc_simple_card_of_parse_routing(card, NULL);

	if (ret < 0)

		return ret;

sound/soc/generic/simple-card-utils.c

+3 −7
Original line number Diff line number Diff line
@@ -417,8 +417,7 @@ int asoc_simple_card_clean_reference(struct snd_soc_card *card) 
EXPORT_SYMBOL_GPL(asoc_simple_card_clean_reference);



int asoc_simple_card_of_parse_routing(struct snd_soc_card *card,

				      char *prefix,

				      int optional)

				      char *prefix)

{

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

	char prop[128];
@@ -428,11 +427,8 @@ int asoc_simple_card_of_parse_routing(struct snd_soc_card *card, 


	snprintf(prop, sizeof(prop), "%s%s", prefix, "routing");



	if (!of_property_read_bool(node, prop)) {

		if (optional)

	if (!of_property_read_bool(node, prop))

		return 0;

		return -EINVAL;

	}



	return snd_soc_of_parse_audio_routing(card, prop);

}

sound/soc/generic/simple-card.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) 
	if (ret < 0)

		goto card_parse_end;



	ret = asoc_simple_card_of_parse_routing(card, PREFIX, 1);

	ret = asoc_simple_card_of_parse_routing(card, PREFIX);

	if (ret < 0)

		goto card_parse_end;