diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-11-21 02:11:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-21 13:28:49 +0000 |
| commit | 33404f3f10beaf0d69d8765f5804b6fb3b305f0f (patch) | |
| tree | 2ff2e4cd1dce3e7b6fb125e9a9f89703a8615edd /sound/soc/generic/simple-card-utils.c | |
| parent | a48bf02b35d9325eedb56ab531038511695a2734 (diff) | |
| download | linux-33404f3f10beaf0d69d8765f5804b6fb3b305f0f.tar.gz linux-33404f3f10beaf0d69d8765f5804b6fb3b305f0f.tar.bz2 linux-33404f3f10beaf0d69d8765f5804b6fb3b305f0f.zip | |
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>
Diffstat (limited to 'sound/soc/generic/simple-card-utils.c')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index a16373193b56..c69ce1e563cd 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -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); } |