[PATCH 30/39 v2] ASoC: rsrc-card: use asoc_simple_card_parse_card_name()

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto...@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
---
 sound/soc/sh/rcar/rsrc-card.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index 87b9d87..3aef7b7 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -334,9 +334,6 @@ static int rsrc_card_parse_of(struct device_node *node,
                                               "audio-routing");
        }
 
-       /* Parse the card name from DT */
-       snd_soc_of_parse_card_name(&priv->snd_card, "card-name");
-
        /* sampling rate convert */
        of_property_read_u32(node, "convert-rate", &priv->convert_rate);
 
@@ -352,8 +349,9 @@ static int rsrc_card_parse_of(struct device_node *node,
        if (ret < 0)
                return ret;
 
-       if (!priv->snd_card.name)
-               priv->snd_card.name = priv->snd_card.dai_link->name;
+       ret = asoc_simple_card_parse_card_name(&priv->snd_card, "card-");
+       if (ret < 0)
+               return ret;
 
        return 0;
 }
-- 
1.9.1