mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
ASoC: rsrc-card: use asoc_simple_card_parse_card_name()
Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]>
This commit is contained in:
parent
303c3be428
commit
53ae918f11
1 changed files with 3 additions and 5 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue