From patchwork Tue Aug 18 10:11:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lin, Mengdong" X-Patchwork-Id: 7030301 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5AC849F373 for ; Tue, 18 Aug 2015 09:59:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B4C4206C5 for ; Tue, 18 Aug 2015 09:59:45 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5392B206B7 for ; Tue, 18 Aug 2015 09:59:44 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 56F95261A28; Tue, 18 Aug 2015 11:59:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C3558261584; Tue, 18 Aug 2015 11:58:59 +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 1665126155E; Tue, 18 Aug 2015 11:58:58 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by alsa0.perex.cz (Postfix) with ESMTP id C3FF326051B for ; Tue, 18 Aug 2015 11:58:22 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 18 Aug 2015 02:58:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,701,1432623600"; d="scan'208";a="785926379" Received: from amanda-hsw-pc.sh.intel.com ([10.239.159.75]) by fmsmga002.fm.intel.com with ESMTP; 18 Aug 2015 02:58:20 -0700 From: mengdong.lin@intel.com To: alsa-devel@alsa-project.org Date: Tue, 18 Aug 2015 18:11:51 +0800 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: tiwai@suse.de, Mengdong Lin , broonie@kernel.org, mengdong.lin@linux.intel.com, liam.r.girdwood@intel.com Subject: [alsa-devel] [PATCH v2 1/3] ASoC: topology: Bind vendor specific kcontrol handlers before standard ones 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 Vendor specific handlers should override standard handlers. So we can handle things in the order from specific to generic. Signed-off-by: Mengdong Lin diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 865a141..a6541a1 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -136,7 +136,7 @@ struct snd_soc_tplg_ops { int (*manifest)(struct snd_soc_component *, struct snd_soc_tplg_manifest *); - /* bespoke kcontrol handlers available for binding */ + /* vendor specific kcontrol handlers available for binding */ const struct snd_soc_tplg_kcontrol_ops *io_ops; int io_ops_count; }; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 04764fd..707c360 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -66,7 +66,7 @@ struct soc_tplg { u32 index; /* current block index */ u32 req_index; /* required index, only loaded/free matching blocks */ - /* kcontrol operations */ + /* vendor specific kcontrol operations */ const struct snd_soc_tplg_kcontrol_ops *io_ops; int io_ops_count; @@ -513,22 +513,7 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, { int i; - /* try and map standard kcontrols handler first */ - for (i = 0; i < num_ops; i++) { - - if (ops[i].id == hdr->ops.put) - k->put = ops[i].put; - if (ops[i].id == hdr->ops.get) - k->get = ops[i].get; - if (ops[i].id == hdr->ops.info) - k->info = ops[i].info; - } - - /* standard handlers found ? */ - if (k->put && k->get && k->info) - return 0; - - /* none found so try bespoke handlers */ + /* try and map vendor specific kcontrol handlers first */ for (i = 0; i < num_bops; i++) { if (k->put == NULL && bops[i].id == hdr->ops.put) @@ -539,7 +524,22 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr, k->info = bops[i].info; } - /* bespoke handlers found ? */ + /* vendor specific handlers found ? */ + if (k->put && k->get && k->info) + return 0; + + /* none found so try standard kcontrol handlers */ + for (i = 0; i < num_ops; i++) { + + if (k->put == NULL && ops[i].id == hdr->ops.put) + k->put = ops[i].put; + if (k->get == NULL && ops[i].id == hdr->ops.get) + k->get = ops[i].get; + if (k->info == NULL && ops[i].id == hdr->ops.info) + k->info = ops[i].info; + } + + /* standard handlers found ? */ if (k->put && k->get && k->info) return 0;