mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

topology: dapm - coding fixes

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-13 21:52:13 +01:00
parent 3b9e39dab5
commit 0d6949b7f1
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/topology/dapm.c
View file

@ -152,8 +152,7 @@ static int copy_dapm_control(struct tplg_elem *elem, struct tplg_elem *ref)
} }
/* check referenced controls for a widget */ /* check referenced controls for a widget */
static int tplg_build_widget(snd_tplg_t *tplg, static int tplg_build_widget(snd_tplg_t *tplg, struct tplg_elem *elem)
struct tplg_elem *elem)
{ {
struct tplg_ref *ref; struct tplg_ref *ref;
struct list_head *base, *pos; struct list_head *base, *pos;
@ -164,7 +163,7 @@ static int tplg_build_widget(snd_tplg_t *tplg,
/* A widget's private data sits before the embedded controls. /* A widget's private data sits before the embedded controls.
* So merge the private data blocks at first * So merge the private data blocks at first
*/ */
list_for_each(pos, base) { list_for_each(pos, base) {
ref = list_entry(pos, struct tplg_ref, list); ref = list_entry(pos, struct tplg_ref, list);
if (ref->type != SND_TPLG_TYPE_DATA) if (ref->type != SND_TPLG_TYPE_DATA)
@ -314,7 +313,7 @@ int tplg_build_routes(snd_tplg_t *tplg)
return 0; return 0;
} }
struct tplg_elem* tplg_elem_new_route(snd_tplg_t *tplg) struct tplg_elem *tplg_elem_new_route(snd_tplg_t *tplg)
{ {
struct tplg_elem *elem; struct tplg_elem *elem;
struct snd_soc_tplg_dapm_graph_elem *line; struct snd_soc_tplg_dapm_graph_elem *line;
@ -342,7 +341,7 @@ struct tplg_elem* tplg_elem_new_route(snd_tplg_t *tplg)
/* line is defined as '"source, control, sink"' */ /* line is defined as '"source, control, sink"' */
static int tplg_parse_line(const char *text, static int tplg_parse_line(const char *text,
struct snd_soc_tplg_dapm_graph_elem *line) struct snd_soc_tplg_dapm_graph_elem *line)
{ {
char buf[LINE_SIZE]; char buf[LINE_SIZE];
unsigned int len, i; unsigned int len, i;
@ -422,7 +421,7 @@ static int tplg_parse_routes(snd_tplg_t *tplg, snd_config_t *cfg, int index)
} }
int tplg_parse_dapm_graph(snd_tplg_t *tplg, snd_config_t *cfg, int tplg_parse_dapm_graph(snd_tplg_t *tplg, snd_config_t *cfg,
void *private ATTRIBUTE_UNUSED) void *private ATTRIBUTE_UNUSED)
{ {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_t *n; snd_config_t *n;
@ -472,7 +471,7 @@ int tplg_parse_dapm_graph(snd_tplg_t *tplg, snd_config_t *cfg,
/* DAPM Widget */ /* DAPM Widget */
int tplg_parse_dapm_widget(snd_tplg_t *tplg, int tplg_parse_dapm_widget(snd_tplg_t *tplg,
snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) snd_config_t *cfg, void *private ATTRIBUTE_UNUSED)
{ {
struct snd_soc_tplg_dapm_widget *widget; struct snd_soc_tplg_dapm_widget *widget;
struct tplg_elem *elem; struct tplg_elem *elem;
@ -645,7 +644,7 @@ int tplg_add_route(snd_tplg_t *tplg, struct snd_tplg_graph_elem *t)
snd_strlcpy(line->source, t->src, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); snd_strlcpy(line->source, t->src, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
if (t->ctl) if (t->ctl)
snd_strlcpy(line->control, t->ctl, snd_strlcpy(line->control, t->ctl,
SNDRV_CTL_ELEM_ID_NAME_MAXLEN); SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
snd_strlcpy(line->sink, t->sink, SNDRV_CTL_ELEM_ID_NAME_MAXLEN); snd_strlcpy(line->sink, t->sink, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
return 0; return 0;