From patchwork Tue Jul 1 07:47:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 4456951 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 929FE9F26C for ; Tue, 1 Jul 2014 07:49:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A46A7203F4 for ; Tue, 1 Jul 2014 07:49:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 4B9FA203EB for ; Tue, 1 Jul 2014 07:49:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D8BC12656D1; Tue, 1 Jul 2014 09:49:34 +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=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 8A2922656A4; Tue, 1 Jul 2014 09:49:10 +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 1DB0C264F22; Tue, 1 Jul 2014 09:49:09 +0200 (CEST) Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by alsa0.perex.cz (Postfix) with ESMTP id EB0E42656A4 for ; Tue, 1 Jul 2014 09:48:42 +0200 (CEST) Received: by mail-we0-f180.google.com with SMTP id x48so9142719wes.39 for ; Tue, 01 Jul 2014 00:48:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WAgrBhS5I8FhXXVqQ1mcM0WFWX0FesnkbfqQKY+5iiI=; b=WmbP17dODjqDhGfCVqzfPibMRZcPgI+hiGpHYiiLLRCQimJV/ogM9AIGFq4gG3tj5n 1kI3FBB3G+uauFBQWmDTt5bn6258abH9vcSPYyfgOQ6J7fuOR4ETVa0DvAFLiNi4/UJQ Lk0knD/8q6jMk/yd75WgdD+J5al4eeGJEDxTjJU1duBYCbCh0b652P4+FZL3XBDSJgeR AvBu36WCUSYQ7TrX6Pk5chbBrobjCOMX9q/bSLuHpGQGoPSmpmSBLSlKGQRo/tormvS8 5r15D+u4c4SoWrekZOMsSgYUMSFsgF5PcTgCqBwXXecSaqJpBcrrocS4djS81p2xp+Me FroQ== X-Gm-Message-State: ALoCoQkOGwsmO6xtOUaDKRusRRrkCbKHIIdJKt+lL0QBddpJFZMsbk1YIWv9zTiHGC/p0AawsJ+I X-Received: by 10.194.24.36 with SMTP id r4mr50078566wjf.35.1404200922500; Tue, 01 Jul 2014 00:48:42 -0700 (PDT) Received: from localhost.localdomain (lau06-1-82-228-246-9.fbx.proxad.net. [82.228.246.9]) by mx.google.com with ESMTPSA id bq7sm40353720wib.7.2014.07.01.00.48.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Jul 2014 00:48:41 -0700 (PDT) From: Benoit Cousson To: broonie@kernel.org, lgirdwood@gmail.com, lars@metafoo.de Date: Tue, 1 Jul 2014 09:47:54 +0200 Message-Id: <1404200881-32253-2-git-send-email-bcousson@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404200881-32253-1-git-send-email-bcousson@baylibre.com> References: <1404200881-32253-1-git-send-email-bcousson@baylibre.com> Cc: misael.lopez@ti.com, alsa-devel@alsa-project.org, Benoit Cousson Subject: [alsa-devel] [PATCH v4 1/8] ASoC: core: Change soc_link_dai_widgets signature for multiple codecs 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 Since multiple codecs DAI will be usable in the future, remove explicit unique codec_dai and cpu_dai parameters. Replace them with snd_soc_pcm_runtime pointer that will contain every instances. No functionale change. Signed-off-by: Benoit Cousson --- sound/soc/soc-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 19c1e958..37a965c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1448,9 +1448,10 @@ static int soc_probe_codec_dai(struct snd_soc_card *card, static int soc_link_dai_widgets(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link, - struct snd_soc_dai *cpu_dai, - struct snd_soc_dai *codec_dai) + struct snd_soc_pcm_runtime *rtd) { + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; struct snd_soc_dapm_widget *play_w, *capture_w; int ret; @@ -1565,8 +1566,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) codec2codec_close_delayed_work); /* link the DAI widgets */ - ret = soc_link_dai_widgets(card, dai_link, - cpu_dai, codec_dai); + ret = soc_link_dai_widgets(card, dai_link, rtd); if (ret) return ret; }