mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Kuninori Morimoto 2016-07-12 00:00:00 +00:00 committed by Mark Brown
parent 303c3be428
commit 53ae918f11
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/sh/rcar/rsrc-card.c
View File

@ -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;
}