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 d1f17172dce25ca3dc81d58e76be441ef58133c3..6d69ed2bd7b1115a2f83fdb511466a6ebe8068b8 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 26eb6ff9b9f37b18dbc3deeb87215aa8b9de4479..101c7da2df7c818dfa449fa2b53190b714954a09 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 1f754933ea9f61fef71e41a145d3c46afd735dae..c46947393f800288eea44482bd9558f1b877fe1f 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 a16373193b56d8b0bdae5c2f4d3b5ed183cff174..c69ce1e563cd083463d03e32295e1d60aaf21369 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 5a3f59aa4ba55c463e4ccd0de9424d265955aea6..ff3f9fa9ab5ad59467ddd6e9d198f4f95aa81d4a 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 2d3ef6ebe86387df41eacb867b65086d46ef8f75..e650143eb5320d6ca7bb7b1d33a6425a37c2a3ee 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;