From patchwork Fri Nov 23 14:11:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151863 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2163694ljp; Fri, 23 Nov 2018 06:11:32 -0800 (PST) X-Google-Smtp-Source: AFSGD/U6V7/hkAn/wkWXCZVoPRA/L2AqnqxM5bUI7A4wL3WhFqotSYFK5xJMbe7J/vdJiydFH9u9 X-Received: by 2002:adf:b190:: with SMTP id q16mr14117911wra.95.1542982292384; Fri, 23 Nov 2018 06:11:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982292; cv=none; d=google.com; s=arc-20160816; b=UgWY5gZVY/Rxby8066GogTZeFFDagpp6iFOyE9vynI0wrX73nKdFrnYaoGlvKXHmsc D3namECFqVWE+eNm8R5JtwvLv5RoBHM4fPc2OC84dsctaSCgDjsxi26rk/kROqO20bwa j2AyBBWLRkl3zjOxJfA43kJcISYfj1wQcaQX/B7t0BTm9EjzusIvZnLIG5thW+RqG7ap 3A+cSq0K9ur6ctbOI1/8E1qHw8rKXAJJxin27ztGdoI92tYwtrbDcEX0186d9renN4Aj IpQV1vdNGC6GrgX2e60qz6kCMZ7XfS241Ox+GDJ94IgvZaHjw61RC5lRsVxz6RUN+16D 5qhA== 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; bh=HzasX8Tfx4rzleyfXdXf9h479eefcweFXFeEqvWlioo=; b=kdIC4hC6v7Ql+xOfvcjx6+kLQcDSKtzoBTZssjHy0EUcXnj5s4Vlef5PlGqbhbYmiR M3sf3HtO52Q/XldK3brj/W/Vuns1MjbOD/224qpAaV9T8GOi/UjEHAXbMtZDWt2lQ6QL CTNdf9lyd97eJ+I01mJu+4soa8pVC3CUmJnANBInkY+E1/Nd0dROheR3KnmjvkD59g9I 5YykN8HOqvW9SqSLnECzo4oMnprKQDdEzBgv7yV4XulsPVZOs16JFm5SX28VRIYXNxT1 sVQ3UpRSfw9reBl4CMknR+AQgo8LSHAR0fOebJheq9Aqm6Z4k/w/P6FUdCsGO3TmvXrL XZTA== 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=cF1Dpk64; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id p3si6290468wmi.154.2018.11.23.06.11.32; Fri, 23 Nov 2018 06:11:32 -0800 (PST) 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=cF1Dpk64; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 37899267A80; Fri, 23 Nov 2018 15:11:31 +0100 (CET) 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 9AC52267A8A; Fri, 23 Nov 2018 15:11:27 +0100 (CET) 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,RCVD_IN_DNSWL_NONE 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 7D3BE267A80 for ; Fri, 23 Nov 2018 15:11:25 +0100 (CET) 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=R2QSYzFfghk46ZJ3w2MXzTlcSRz5iYaEYAt2UYANmNg=; b=cF1Dpk64Zz8b NtqhQ5bkrAQrdw0m79IPI8fQ4Wrni+FMK3Y/coofMKp4OxpQzN1Ht7TBEH3ZtEToiE79snC4COjI9 f1NFrag9zOzxN1ty3KNP3IF+a1l7gJ73qZ/OUhEBqAXkrrdXbQmiiZgHRUVZoc7v0NIGNckSCwKa6 tr1oY=; Received: from [176.12.107.140] (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 1gQCB2-00017y-Vq; Fri, 23 Nov 2018 14:11:25 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id AF452440078; Fri, 23 Nov 2018 14:11:23 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87muq2lyxy.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181123141123.AF452440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:11:23 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: audio-graph-card: tidyup define position" 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: audio-graph-card: tidyup define position has been applied to the asoc tree at https://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 64ef0817b9679b525f86773e929777be96f5c728 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Nov 2018 00:57:40 +0000 Subject: [PATCH] ASoC: audio-graph-card: tidyup define position commit f986907c9225 ("ASoC: audio-graph-card: add widgets and routing for external amplifier support") added new function asoc_graph_card_outdrv_event(), but the inserted position breaks define area. This patch tidyup it Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/generic/audio-graph-card.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 101c7da2df7c..1b158cc2df88 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -36,6 +36,11 @@ struct graph_card_data { struct gpio_desc *pa_gpio; }; +#define graph_priv_to_card(priv) (&(priv)->snd_card) +#define graph_priv_to_props(priv, i) ((priv)->dai_props + (i)) +#define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev) +#define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i)) + static int asoc_graph_card_outdrv_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) @@ -63,11 +68,6 @@ static const struct snd_soc_dapm_widget asoc_graph_card_dapm_widgets[] = { SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), }; -#define graph_priv_to_card(priv) (&(priv)->snd_card) -#define graph_priv_to_props(priv, i) ((priv)->dai_props + (i)) -#define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev) -#define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i)) - static int asoc_graph_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data;