ASoC: simple-card: use asoc_simple_card_of_parse_routing()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 15 Jun 2017 00:25:17 +0000 (00:25 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 15 Jun 2017 17:15:00 +0000 (18:15 +0100)
Current simple/audio scu card drivers are supporting same
routing on DT, but, doesn't use same function for it.
Encapsulation is one of simple card util's purpose.
Let's use asoc_simple_card_of_parse_routing

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card.c

index 8b414af966eef2feff187cbd7b5dc4fe7b5a2fa2..7b2533c7f82e2cc110ba7f824d2763aec6f1fa0c 100644 (file)
@@ -362,13 +362,9 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
                        goto card_parse_end;
        }
 
-       /* DAPM routes */
-       if (of_property_read_bool(node, PREFIX "routing")) {
-               ret = snd_soc_of_parse_audio_routing(card,
-                                       PREFIX "routing");
-               if (ret)
-                       goto card_parse_end;
-       }
+       ret = asoc_simple_card_of_parse_routing(card, PREFIX, 1);
+       if (ret < 0)
+               goto card_parse_end;
 
        /* Factor to mclk, used in hw_params() */
        of_property_read_u32(node, PREFIX "mclk-fs", &priv->mclk_fs);