redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Kuninori Morimoto 2018-11-21 02:11:13 +00:00 committed by Mark Brown
parent a48bf02b35
commit 33404f3f10
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/simple_card_utils.h
View File

@ -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);

2
sound/soc/generic/audio-graph-card.c
View File

@ -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;

2
sound/soc/generic/audio-graph-scu-card.c
View File

@ -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;

10
sound/soc/generic/simple-card-utils.c
View File

@ -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)
return 0;
return -EINVAL;
}
if (!of_property_read_bool(node, prop))
return 0;
return snd_soc_of_parse_audio_routing(card, prop);
}

2
sound/soc/generic/simple-card.c
View File

@ -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;

2
sound/soc/generic/simple-scu-card.c
View File

@ -198,7 +198,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
if (ret < 0)
return ret;
ret = asoc_simple_card_of_parse_routing(card, PREFIX, 0);
ret = asoc_simple_card_of_parse_routing(card, PREFIX);
if (ret < 0)
return ret;