From: Liam Girdwood <lrg@slimlogic.co.uk>
Date: Tue, 21 Dec 2010 22:11:52 +0000 (+0100)
Subject: ucm: remove parse_device() and call parse_compound() directly
X-Git-Tag: v1.0.24~6^2~10
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=8524941f2a1b3dcad2b1ec5edcdb556bd2396da8;p=alsa-lib.git

ucm: remove parse_device() and call parse_compound() directly

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 7d547f4a..f3a75e6d 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -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);