]> git.alsa-project.org Git - alsa-lib.git/commitdiff
ucm: remove parse_device() and call parse_compound() directly
authorLiam Girdwood <lrg@slimlogic.co.uk>
Tue, 21 Dec 2010 22:11:52 +0000 (23:11 +0100)
committerJaroslav Kysela <perex@perex.cz>
Wed, 22 Dec 2010 07:05:27 +0000 (08:05 +0100)
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
src/ucm/parser.c

index 7d547f4ad49a10ac07c0a4035cf112c0eb9ea649..f3a75e6d202f624db80ec6087ba89e1262807e0d 100644 (file)
@@ -633,13 +633,6 @@ static int parse_device_name(snd_use_case_mgr_t *uc_mgr,
                              data1, (void *)id);
 }
 
-static int parse_device(snd_use_case_mgr_t *uc_mgr,
-                       struct use_case_verb *verb,
-                       snd_config_t *cfg)
-{
-       return parse_compound(uc_mgr, cfg, parse_device_name, verb, NULL);
-}
-
 static int parse_modifier_name(snd_use_case_mgr_t *uc_mgr,
                             snd_config_t *cfg,
                             void *data1,
@@ -824,7 +817,8 @@ static int parse_verb_file(snd_use_case_mgr_t *uc_mgr,
 
                /* find device sections and parse them */
                if (strcmp(id, "SectionDevice") == 0) {
-                       err = parse_device(uc_mgr, verb, n);
+                       err = parse_compound(uc_mgr, n,
+                                               parse_device_name, verb, NULL);
                        if (err < 0) {
                                uc_error("error: %s failed to parse device",
                                                file);