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>

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index d1f1717..6d69ed2 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -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);
 

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 26eb6ff..101c7da 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -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;
 

diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c
index 1f75493..c469473 100644 (file)
--- a/sound/soc/generic/audio-graph-scu-card.c
+++ b/sound/soc/generic/audio-graph-scu-card.c
@@ -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;
 

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index a163731..c69ce1e 100644 (file)
--- 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);
 }

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 5a3f59a..ff3f9fa 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -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;
 

diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
index 2d3ef6e..e650143 100644 (file)
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
@@ -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;