From patchwork Sun Aug 27 13:37:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 111075 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp3581246qge; Sun, 27 Aug 2017 06:38:12 -0700 (PDT) X-Received: by 10.28.102.11 with SMTP id a11mr1985873wmc.127.1503841092750; Sun, 27 Aug 2017 06:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503841092; cv=none; d=google.com; s=arc-20160816; b=C8zxT7DLn2kL5N+awVQPuDJMPID/YlqVsLvky2IwoGCzYMJlC4k92nwin33UEeKCWu b4u2ZHv/9rHf6ss1NMPvwJph4vRHEIs/0xocQgpe0yCwbh25ChAz3DpmKSuAA0pRioKA qGn86lna0m4tEek0yor6k3dhktJQYecU4TdC4f3dz6BOyrmviFTIbJ5KnOfktT22Subo UZVEOKdaMwT/bhS6hf+i8p2+JeP6MupiYqcg1IFWgDKhh9ESLHIfm0FXxWMkdBSN0RTr lr1txzz6x2t1VQKDLitgFrvG/W6nKvn7/6lsefejfVO5TD26c0EyrYtvF+hRIm9bETOb 1Vzg== 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 :dkim-signature:delivered-to:arc-authentication-results; bh=X9BRQDhf6lixT+qLE6NsMV/wxZFoLFZBTpuJyRZRVdw=; b=0TqYI97UVwnx5qryLlpXYXDVYiJgufskLQRStGKwRRXxNGeUAknWf7egfpir1HdL7H mJXIvMK3UtL6pAXAfDQD6Q9792eH+sse8TsuemX/B3uJPwVY2tQOUgbEQyrpyJ0RVs/4 yeR8eBaS73ZyElcMpK/UhapD4KFlcbgPbUMMe2L0k0msVjZve/VCpyK1GMek0RA9zGF2 5HxaYe9fW/5G6cB0joaq4fwgr9p00cS5fblgZnRiIfsCkKTeBLTlUt9Rb9TmTtY8V3Fp SFtcaw2tDAsl7rG/95HsqGkKDd5YNyTVBLOBRzyrtteft95A6eC5QEX3LVa6O4aSfhaW UeTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=GrJcWNcE; 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 79si4531811wmq.114.2017.08.27.06.38.12; Sun, 27 Aug 2017 06:38:12 -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; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=GrJcWNcE; 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 5C817266F4E; Sun, 27 Aug 2017 15:37:57 +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 A41A0266EBF; Sun, 27 Aug 2017 15:37:55 +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=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id C5C34266EBF for ; Sun, 27 Aug 2017 15:37:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=0hHlDL7ocgGhKXixVQDM1xG3cLUyKwhJuWCKXsBa5tc=; b=GrJcWNcEc9Ba DcEUOoBBqud+kpNHx9wk0Ht7RzGIlMOM7YQbJGymqQbV1AVyvFco1VUsrxZhHl0yOAJapxSFu2lae RDdnMTcZa0FaiNF95ALhc73C6Unv/4TIh1xvgeveW1JW1+AfhJWWOnmipPzk2MdHDGwIAcPMX2dMo Hed98=; Received: from [2001:4d48:ad55:2401:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dlxl7-0005SN-IM; Sun, 27 Aug 2017 13:37:49 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 33DE54400E7; Sun, 27 Aug 2017 14:37:49 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87378gsdha.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20170827133749.33DE54400E7@finisterre.ee.mobilebroadband> Date: Sun, 27 Aug 2017 14:37:49 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: remove duplicate definition of dapm_widgets/num_dapm_widgets" 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: remove duplicate definition of dapm_widgets/num_dapm_widgets 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 688d0ebf49a97aa6959aebec5d177a8b821f27d1 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 25 Aug 2017 00:29:20 +0000 Subject: [PATCH] ASoC: remove duplicate definition of dapm_widgets/num_dapm_widgets snd_soc_component and snd_soc_component_driver both have dapm_widgets/num_dapm_widgets, but these are duplicated. Let's remove duplicated definition. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- include/sound/soc.h | 2 -- sound/soc/soc-core.c | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/include/sound/soc.h b/include/sound/soc.h index e4b4746032ba..3e0070ed6883 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -862,8 +862,6 @@ struct snd_soc_component { /* Don't use these, use snd_soc_component_get_dapm() */ struct snd_soc_dapm_context dapm; - const struct snd_soc_dapm_widget *dapm_widgets; - unsigned int num_dapm_widgets; const struct snd_soc_dapm_route *dapm_routes; unsigned int num_dapm_routes; struct snd_soc_codec *codec; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1317706f8e69..3a3236dc996d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1451,9 +1451,10 @@ static int soc_probe_component(struct snd_soc_card *card, soc_init_component_debugfs(component); - if (component->dapm_widgets) { - ret = snd_soc_dapm_new_controls(dapm, component->dapm_widgets, - component->num_dapm_widgets); + if (component->driver->dapm_widgets) { + ret = snd_soc_dapm_new_controls(dapm, + component->driver->dapm_widgets, + component->driver->num_dapm_widgets); if (ret != 0) { dev_err(component->dev, @@ -3185,8 +3186,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, if (driver->stream_event) dapm->stream_event = snd_soc_component_stream_event; - component->dapm_widgets = driver->dapm_widgets; - component->num_dapm_widgets = driver->num_dapm_widgets; component->dapm_routes = driver->dapm_routes; component->num_dapm_routes = driver->num_dapm_routes;