提交 12ffa6fc 编写于 作者: K Kuninori Morimoto 提交者: Mark Brown

ASoC: simple-card: card name can be option

snd_card.name is now option on DT case.
non-DT case can follow same style,
and it is understandable from platform point of view.
Signed-off-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: NMark Brown <broonie@linaro.org>
上级 81985bd6
...@@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ...@@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
} }
if (!cinfo->name || if (!cinfo->name ||
!cinfo->card ||
!cinfo->codec_dai.name || !cinfo->codec_dai.name ||
!cinfo->codec || !cinfo->codec ||
!cinfo->platform || !cinfo->platform ||
...@@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) ...@@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
priv->snd_card.name = cinfo->card; priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name;
dai_link->name = cinfo->name; dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name; dai_link->stream_name = cinfo->name;
dai_link->platform_name = cinfo->platform; dai_link->platform_name = cinfo->platform;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册