]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: simple-card: use asoc_simple_card_of_parse_widgets()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 16 Jun 2017 01:39:11 +0000 (01:39 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 16 Jun 2017 16:58:39 +0000 (17:58 +0100)
Current simple card driver is supporting widgets on DT,
other simple/audio card drivers will support it.
Encapsulation is one of simple card util's purpose.
Let's use asoc_simple_card_of_parse_widgets

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 7b2533c7f82e2cc110ba7f824d2763aec6f1fa0c..8b7b47251fe14fc76c9569f8a2f6a583ea8d8b12 100644 (file)
@@ -354,13 +354,9 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv)
 
        dai_link = of_get_child_by_name(node, PREFIX "dai-link");
 
-       /* The off-codec widgets */
-       if (of_property_read_bool(node, PREFIX "widgets")) {
-               ret = snd_soc_of_parse_audio_simple_widgets(card,
-                                       PREFIX "widgets");
-               if (ret)
-                       goto card_parse_end;
-       }
+       ret = asoc_simple_card_of_parse_widgets(card, PREFIX);
+       if (ret < 0)
+               goto card_parse_end;
 
        ret = asoc_simple_card_of_parse_routing(card, PREFIX, 1);
        if (ret < 0)