ucm: simplify get_by_card() in parser.c

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-06-22 09:05:24 +02:00
parent 089bb8762f
commit 730481ec2f

View file

@ -1911,7 +1911,8 @@ static int get_card_info(snd_use_case_mgr_t *mgr,
if (err < 0) if (err < 0)
return err; return err;
*info = ctl_list->ctl_info; if (info)
*info = ctl_list->ctl_info;
return err; return err;
} }
@ -1961,18 +1962,9 @@ static int get_by_card_name(snd_use_case_mgr_t *mgr, const char *card_name)
} }
/* set the driver name and long name by the card ctl name */ /* set the driver name and long name by the card ctl name */
static int get_by_card(snd_use_case_mgr_t *mgr, const char *ctl_name) static inline int get_by_card(snd_use_case_mgr_t *mgr, const char *ctl_name)
{ {
snd_ctl_card_info_t *info; return get_card_info(mgr, ctl_name, NULL);
int err;
snd_ctl_card_info_alloca(&info);
err = get_card_info(mgr, ctl_name, &info);
if (err)
return err;
return 0;
} }
static int parse_toplevel_path(snd_use_case_mgr_t *uc_mgr, static int parse_toplevel_path(snd_use_case_mgr_t *uc_mgr,