From patchwork Thu Jun 8 16:45:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 103400 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2529090qgd; Thu, 8 Jun 2017 09:45:23 -0700 (PDT) X-Received: by 10.223.175.11 with SMTP id z11mr25685290wrc.11.1496940323065; Thu, 08 Jun 2017 09:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496940323; cv=none; d=google.com; s=arc-20160816; b=YgPKTROOelBohtWmOiD8rm5d/CYG2Hl4WvdFmEylzA70oDis35cBqVfi2iuPJoRlcC vi83wVAQ8xltcwfCtzvgqOcw4ChFD7wZLYzIIciPHsGg7k17ND24dzJ1hwMle3Ig7wmj jmQPbN0XyRHfI3GP7CeAw43te2P2GEZ18bstfXR9UWzePet30sERe7BUKYcQ21csINKH u3cDbfiPyDONo3dS+54efl9uNiJoq4cMng2hy5/OLhClsqW1dmdneFiTFnrpjxhAc2xw Of7vW2RScqn6Szeudi2B+BxMy6D5QUhPeb1zOoR1K6mAVxaGWVmiSUpt2FXRF5sXTnXR yE7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :delivered-to:arc-authentication-results; bh=aJM738RveOpHfzgD0RYR4Deb6Ihqys+/DRjuQRBpK1c=; b=HjUh1DEovrwq/5/aoItxvrHO3mVftTB9ABQMDFbgTWmQO6Hkrakj2vfcHsrJHV6RHi iXFt0/MxqchAMDX1xNGsrQaFggBq6niBIRK7xc+/Y6yYzu/jYypVJHvcitDkIZrz/mWW VfBpFp4eGS8O0huUdFOiEMdguVRmzF30k3XXVovgF+R/ZqsI19etR3Ux/BH2sObudV0d LLYOMWw5wDCG9W2vX+DqzUUrO/3t6POdolYjO3c3MZr1GApnpaNpfkRXfhbz/B25fI56 NXvL3OUCxL/dSmbCyAxxm+WYW1DY5eigv+RxKvEiR3p9OZetTwU3o6Yo5nOlJeUOVgMs YyLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id d11si6267753wmi.97.2017.06.08.09.45.22; Thu, 08 Jun 2017 09:45:23 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 251F5267275; Thu, 8 Jun 2017 18:45:21 +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 6B95F267275; Thu, 8 Jun 2017 18:45:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id 54BC326725C for ; Thu, 8 Jun 2017 18:45:15 +0200 (CEST) Received: from [2001:470:1f1d:6b5::3] (helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dJ0YW-0008On-UO; Thu, 08 Jun 2017 16:45:11 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dJ0YU-0001xt-57; Thu, 08 Jun 2017 17:45:06 +0100 From: Mark Brown To: Mark Brown In-Reply-To: <20170608161054.31842-1-broonie@kernel.org> Message-Id: Date: Thu, 08 Jun 2017 17:45:06 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: alsa-devel@alsa-project.org, Liam Girdwood Subject: [alsa-devel] Applied "ASoC: Back out post commit widget creation changes" to the asoc tree 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 The patch ASoC: Back out post commit widget creation changes has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 102ebe266c317da59471e2cde0dce603de031482 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 8 Jun 2017 17:02:02 +0100 Subject: [PATCH] ASoC: Back out post commit widget creation changes Due to build errors revert commit c8597af855f3 (ASoC: topology: Allow bespoke configuration post widget creation) until they can be fixed. Signed-off-by: Mark Brown --- sound/soc/soc-topology.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 7006cf3007b5..f4ec236a418e 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -344,24 +344,12 @@ static int soc_tplg_widget_load(struct soc_tplg *tplg, return 0; } -/* optionally pass new dynamic widget to component driver. This is mainly for - * external widgets where we can assign private data/ops */ -static int soc_tplg_widget_ready(struct soc_tplg *tplg, - struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) -{ - if (tplg->comp && tplg->ops && tplg->ops->widget_ready) - return tplg->ops->widget_ready(tplg->comp, w, tplg_w); - - return 0; -} - /* pass DAI configurations to component driver for extra initialization */ static int soc_tplg_dai_load(struct soc_tplg *tplg, - struct snd_soc_dai_driver *dai_drv, - struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai) + struct snd_soc_dai_driver *dai_drv) { if (tplg->comp && tplg->ops && tplg->ops->dai_load) - return tplg->ops->dai_load(tplg->comp, dai_drv, pcm, dai); + return tplg->ops->dai_load(tplg->comp, dai_drv); return 0; } @@ -1591,16 +1579,8 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, widget->dobj.ops = tplg->ops; widget->dobj.index = tplg->index; list_add(&widget->dobj.list, &tplg->comp->dobj_list); - - ret = soc_tplg_widget_ready(tplg, widget, w); - if (ret < 0) - goto ready_err; - return 0; -ready_err: - snd_soc_tplg_widget_remove(widget); - snd_soc_dapm_free_widget(widget); hdr_err: kfree(template.sname); err: