From patchwork Sun Aug 27 13:37:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 111076 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp3581526qge; Sun, 27 Aug 2017 06:38:30 -0700 (PDT) X-Received: by 10.223.167.9 with SMTP id c9mr2431769wrd.180.1503841110068; Sun, 27 Aug 2017 06:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503841110; cv=none; d=google.com; s=arc-20160816; b=bsFRjeDmiv8I06WwdNMTANW9R0W4hx5P5GIN4LtXcbtK3wOFe9yn5NaRABIlteeN8m PEMOoWTB7IVIIgnJN5XiNZbrim5WDZwvn85XigZKqOfnCgN+vm2YYeEEk+wmPFq49t/t N1479VKdTvfgq/O0qTdd32W5SKkByaWYd8O012D0q5eL8hzcFOqRtTGpV9H0shnuQ5II SEwBlIdvrE6Fqak32oUng5/rTNar1By8n6cNbkG5k3H9ZRYcEZpLuKLua2SGlvTUS0zY EfZbqCP72nb4NM6/Gv+5ggJZFPTesS1NXB3TyPrhz30ngPrEiDv3n3hpdy1ercXuKAm5 yprQ== 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=wRyhIEltZflSC1dLNuyPMJDdHSpBFDYwKb3TYvsMloU=; b=0qkydgMoGcMEP691yJrUd0MS7MBUYXKK/Cel+B6kFHM9PuvZ3tl7XZpa2NOF9YWJti m0cWrEvK3/POTBAxsTefgZ8Hg/3JV433JJJEgaR/XpJzHalRfV8MC6UKAqbBswoO+UkE y5LXOZHyRWmNk4l7XDq+V2aUkKREQScZt+jK4uRBaTZUxDE3rA8e4xzXqqOOreVoN3qT tU7GSlEFL3qP7dYSOMr3aCteZ2VCFpmGQdYED2Q2MnkDxeDfi1/ygJ3XyNxeC1Nvs3gD ZHC4NTsTwctqQeN3eOZVKBafpckyasbXDw/qi46Alu+l3I5fzqPR70CNx8DWTqILcdYP 2B5g== 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=BXgQPnHc; 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 f44si873120wrf.8.2017.08.27.06.38.29; Sun, 27 Aug 2017 06:38:30 -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=BXgQPnHc; 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 C747126746C; Sun, 27 Aug 2017 15:38:18 +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 5311D26746C; Sun, 27 Aug 2017 15:38:17 +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 CD335267455 for ; Sun, 27 Aug 2017 15:37:58 +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=1kDnR4MzGg6Af5Vo630vqxwZRdI4o+0RGewdHJuWF0Q=; b=BXgQPnHca9cC 0o/7NKIwFQ0DJ0sPEwk4fXnBeWgtUujM9B8ya7ZPjVvq80FquqKy/Ga4lx3b5Gu7ecrfLnuEqLXbQ ro98Rp11HcoI3TH5b631UvkpVyXC+bRt5dPWdOs59lft8x63/fDnMYFfKhn831ICBkr/ct2gZGIvH g/yO4=; 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 1dlxlG-0005SW-7E; Sun, 27 Aug 2017 13:37:58 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id D0DDC4400E7; Sun, 27 Aug 2017 14:37:57 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <874lswsdhw.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20170827133757.D0DDC4400E7@finisterre.ee.mobilebroadband> Date: Sun, 27 Aug 2017 14:37:57 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: remove duplicate definition of controls/num_controls" 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 controls/num_controls 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 b8972bf0521ca7ee3c8d27da0fd101fe648acfc2 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 25 Aug 2017 00:29:01 +0000 Subject: [PATCH] ASoC: remove duplicate definition of controls/num_controls snd_soc_component and snd_soc_component_driver both have controls/num_controls, 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 de57a8ad057b..e4b4746032ba 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_kcontrol_new *controls; - unsigned int num_controls; const struct snd_soc_dapm_widget *dapm_widgets; unsigned int num_dapm_widgets; const struct snd_soc_dapm_route *dapm_routes; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3bb8c63564cf..1317706f8e69 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1495,9 +1495,10 @@ static int soc_probe_component(struct snd_soc_card *card, } } - if (component->controls) - snd_soc_add_component_controls(component, component->controls, - component->num_controls); + if (component->driver->controls) + snd_soc_add_component_controls(component, + component->driver->controls, + component->driver->num_controls); if (component->dapm_routes) snd_soc_dapm_add_routes(dapm, component->dapm_routes, component->num_dapm_routes); @@ -3184,8 +3185,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->controls = driver->controls; - component->num_controls = driver->num_controls; component->dapm_widgets = driver->dapm_widgets; component->num_dapm_widgets = driver->num_dapm_widgets; component->dapm_routes = driver->dapm_routes;