From patchwork Wed Jul 27 08:48:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengdong.lin@linux.intel.com X-Patchwork-Id: 9249487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10043607F0 for ; Wed, 27 Jul 2016 08:44:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F066726242 for ; Wed, 27 Jul 2016 08:44:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E05B427C05; Wed, 27 Jul 2016 08:44:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECD9226242 for ; Wed, 27 Jul 2016 08:44:13 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6B73C2658ED; Wed, 27 Jul 2016 10:44:11 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id EDEDA265312; Wed, 27 Jul 2016 10:44:03 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9E5BA26533F; Wed, 27 Jul 2016 10:44:02 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by alsa0.perex.cz (Postfix) with ESMTP id 3241426524F for ; Wed, 27 Jul 2016 10:43:54 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP; 27 Jul 2016 01:43:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,429,1464678000"; d="scan'208"; a="1029964806" Received: from amanda-haswell-pc.sh.intel.com ([10.239.159.169]) by fmsmga002.fm.intel.com with ESMTP; 27 Jul 2016 01:43:51 -0700 From: mengdong.lin@linux.intel.com To: alsa-devel@alsa-project.org Date: Wed, 27 Jul 2016 16:48:53 +0800 Message-Id: <1469609333-13961-1-git-send-email-mengdong.lin@linux.intel.com> X-Mailer: git-send-email 2.5.0 Cc: tiwai@suse.de, mengdong.lin@intel.com, Mengdong Lin , o-takashi@sakamocchi.jp Subject: [alsa-devel] [PATCH v4] topology: Return -EINVAL at once on failure to find a reference X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mengdong Lin In building phase, return error -EINVAL at once if an element's references (e.g. TLV, text, control or private data) cannot be found. Move this error check right after looking up a reference, to make the code more clear. And checking the return value of tplg_copy_data() is enough, no need to check ref->elem for data references. Signed-off-by: Mengdong Lin diff --git a/src/topology/ctl.c b/src/topology/ctl.c index 54f8e44..d910230 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -135,24 +135,23 @@ static int tplg_build_mixer_control(snd_tplg_t *tplg, if (ref->type == SND_TPLG_TYPE_TLV) { ref->elem = tplg_elem_lookup(&tplg->tlv_list, ref->id, SND_TPLG_TYPE_TLV); - if (ref->elem) - err = copy_tlv(elem, ref->elem); + if (!ref->elem) + goto ref_missing; + copy_tlv(elem, ref->elem); } else if (ref->type == SND_TPLG_TYPE_DATA) { err = tplg_copy_data(tplg, elem, ref); if (err < 0) return err; } - - if (!ref->elem) { - SNDERR("error: cannot find '%s' referenced by" - " control '%s'\n", ref->id, elem->id); - return -EINVAL; - } else if (err < 0) - return err; } return 0; + +ref_missing: + SNDERR("error: cannot find '%s' referenced by control '%s'\n", + ref->id, elem->id); + return -EINVAL; } static void copy_enum_texts(struct tplg_elem *enum_elem, @@ -183,23 +182,23 @@ static int tplg_build_enum_control(snd_tplg_t *tplg, if (ref->type == SND_TPLG_TYPE_TEXT) { ref->elem = tplg_elem_lookup(&tplg->text_list, ref->id, SND_TPLG_TYPE_TEXT); - if (ref->elem) - copy_enum_texts(elem, ref->elem); + if (!ref->elem) + goto ref_missing; + copy_enum_texts(elem, ref->elem); } else if (ref->type == SND_TPLG_TYPE_DATA) { err = tplg_copy_data(tplg, elem, ref); if (err < 0) return err; } - if (!ref->elem) { - SNDERR("error: cannot find '%s' referenced by" - " control '%s'\n", ref->id, elem->id); - return -EINVAL; - } else if (err < 0) - return err; } return 0; + +ref_missing: + SNDERR("error: cannot find '%s' referenced by control '%s'\n", + ref->id, elem->id); + return -EINVAL; } /* check referenced private data for a byte control */ diff --git a/src/topology/dapm.c b/src/topology/dapm.c index 4d343b2..988a5fc 100644 --- a/src/topology/dapm.c +++ b/src/topology/dapm.c @@ -160,7 +160,10 @@ static int tplg_build_widget(snd_tplg_t *tplg, base = &elem->ref_list; - /* for each ref in this control elem */ + /* Look up and merge each reference in this widget elem. + * For widgets added by C API, its control elements are already set + * and so no need to look up. + */ list_for_each(pos, base) { ref = list_entry(pos, struct tplg_ref, list); @@ -170,48 +173,50 @@ static int tplg_build_widget(snd_tplg_t *tplg, if (!ref->elem) ref->elem = tplg_elem_lookup(&tplg->mixer_list, ref->id, SND_TPLG_TYPE_MIXER); - if (ref->elem) - err = copy_dapm_control(elem, ref->elem); + if (!ref->elem) + goto ref_missing; + + err = copy_dapm_control(elem, ref->elem); break; case SND_TPLG_TYPE_ENUM: if (!ref->elem) ref->elem = tplg_elem_lookup(&tplg->enum_list, ref->id, SND_TPLG_TYPE_ENUM); - if (ref->elem) - err = copy_dapm_control(elem, ref->elem); + if (!ref->elem) + goto ref_missing; + + err = copy_dapm_control(elem, ref->elem); break; case SND_TPLG_TYPE_BYTES: if (!ref->elem) ref->elem = tplg_elem_lookup(&tplg->bytes_ext_list, ref->id, SND_TPLG_TYPE_BYTES); - if (ref->elem) - err = copy_dapm_control(elem, ref->elem); + if (!ref->elem) + goto ref_missing; + + err = copy_dapm_control(elem, ref->elem); break; case SND_TPLG_TYPE_DATA: err = tplg_copy_data(tplg, elem, ref); - if (err < 0) - return err; break; default: break; } - if (!ref->elem) { - SNDERR("error: cannot find control '%s'" - " referenced by widget '%s'\n", - ref->id, elem->id); - return -EINVAL; - } - if (err < 0) return err; } return 0; + +ref_missing: + SNDERR("error: cannot find '%s' referenced by widget '%s'\n", + ref->id, elem->id); + return -EINVAL; } int tplg_build_widgets(snd_tplg_t *tplg)