OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: simple-card: use asoc_simple_card_parse_dailink_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-11 23:57:34 +00:00 committed by Mark Brown
parent 1db3312e3a
commit 2e8d1c7d54
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/generic/simple-card.c
View File

@ -319,7 +319,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
struct device_node *cpu = NULL; struct device_node *cpu = NULL;
struct device_node *plat = NULL; struct device_node *plat = NULL;
struct device_node *codec = NULL; struct device_node *codec = NULL;
char *name;
char prop[128]; char prop[128];
char *prefix = ""; char *prefix = "";
int ret, cpu_args; int ret, cpu_args;
@ -380,19 +379,13 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
if (!dai_link->platform_of_node) if (!dai_link->platform_of_node)
dai_link->platform_of_node = dai_link->cpu_of_node; dai_link->platform_of_node = dai_link->cpu_of_node;
/* DAI link name is created from CPU/CODEC dai name */ ret = asoc_simple_card_set_dailink_name(dev, dai_link,
name = devm_kzalloc(dev, "%s-%s",
strlen(dai_link->cpu_dai_name) + dai_link->cpu_dai_name,
strlen(dai_link->codec_dai_name) + 2, dai_link->codec_dai_name);
GFP_KERNEL); if (ret < 0)
if (!name) {
ret = -ENOMEM;
goto dai_link_of_err; goto dai_link_of_err;
}
sprintf(name, "%s-%s", dai_link->cpu_dai_name,
dai_link->codec_dai_name);
dai_link->name = dai_link->stream_name = name;
dai_link->ops = &asoc_simple_card_ops; dai_link->ops = &asoc_simple_card_ops;
dai_link->init = asoc_simple_card_dai_init; dai_link->init = asoc_simple_card_dai_init;