diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-07-12 02:00:00 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-16 14:05:09 +0200 |
| commit | 53ae918f117dbb86e7b872e3b7532839f752c895 (patch) | |
| tree | 7e1784149def192dcffeb9391c5da6705a916c6a /sound/soc/sh/rcar/rsrc-card.c | |
| parent | ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai (diff) | |
| download | linux-53ae918f117dbb86e7b872e3b7532839f752c895.tar.xz linux-53ae918f117dbb86e7b872e3b7532839f752c895.zip | |
ASoC: rsrc-card: use asoc_simple_card_parse_card_name()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/rsrc-card.c')
| -rw-r--r-- | sound/soc/sh/rcar/rsrc-card.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 239a13a30bed..fa37f842b62f 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -395,9 +395,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); @@ -413,8 +410,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; } |