From patchwork Thu Sep 20 17:36:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 147118 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp2280261ljw; Thu, 20 Sep 2018 10:36:25 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbZdsjRFZeN/cTQJE10W8m7EBxSNWrIbI73bn0gHPR0UOOi37mEUdU2M+bpFjLWIGPdsiUf X-Received: by 2002:a1c:2644:: with SMTP id m65-v6mr290158wmm.155.1537464984981; Thu, 20 Sep 2018 10:36:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537464984; cv=none; d=google.com; s=arc-20160816; b=0TtCr03r+jH4QWAy/PSF8YiTPcguX5H20V7RsiRBx7cZONZdM8OjtCLVAsFq6vCr1r jzVdblR2t16aaFvMhNwCGKUxb1/vZSfxWON7kOngmP4/5iQptn9bJXX4JfPqcp415i9f zABKkOWoFn1sRAPkwR7ZZ0WM1Xq/7KPUCJuCqM3cw4A4WAfKTzRgt1kwzHyPgEvehqc6 lch7zMSWC6dQGoCIR98CSM5WMHQ1AR4GnCnH8GT1+yh4SuoxNI1IR7XgILhzUC6q+v3F LGFOr2duRCEokgW5XCVnZc56xG9STjtLiUmUzDl/CzNfoG7EZeIMDCzmspM3LFdtmsww KYNA== 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=7iDz4RuQ7Whejwtdir+Msdc08R7183+KGcIVl1OdGc0=; b=z71/9j8mXO2aUB6WDBUNecJTPNNFmKHBgFZeTOGS2XooevuFwN/SMjoXFXVzoQUaDl YRcPmbbxzdhxIpI25pZ1Dc4eziRzJwenVy7mzCTmiJdnzglA4ag4b3P8qhEhZRScTw6W jQ/ZYXf6wBtnu1plqIC/BBwlPqHHhqfXZ34lCJ+vprr3QRqoROCnmMQqXuiSD5Lgpv4e Z4R7PdsrUGCyHfYMKdnB49HpK6I6U+HXG2OXTEm0kWeB2eAEEVGA3zOOw3zVROUlLFxe uh7QxOinq5+icktbOjhxdIfiJzIqAaY6/zLFCdKwPBjENFEwpoIi9Z1jDs9EV8XCWVkB fpcw== 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=TUH+02VB; 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 g20-v6si2796053wme.182.2018.09.20.10.36.24; Thu, 20 Sep 2018 10:36:24 -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=TUH+02VB; 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 B050C2678AD; Thu, 20 Sep 2018 19:36: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 6F0852678AD; Thu, 20 Sep 2018 19:36:19 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, 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 E043126789F for ; Thu, 20 Sep 2018 19:36:11 +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=mjn6BWvfHetFQwKh1iXlE/eGwIAip33Ykjszhwdy+oo=; b=TUH+02VBfn7C ZY3xOAYAJSb36L4HonxcxP5DwKpNPSzreUqb+1rgSTJ8t5qstMEYQTzNpvh7FtII3IhHTUdGDCQCk BMv/hojt5HPLIWePYMn+mr0dlzJEJ/xUys81qxypmVa2QOi1h9x9lJP/HnTrvKuuV+Gm5v+Dpedlf zNAY8=; Received: from [209.121.128.187] (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 1g32s7-0007EQ-JN; Thu, 20 Sep 2018 17:36:11 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id A54B1440078; Thu, 20 Sep 2018 18:36:09 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87y3bzppmg.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20180920173609.A54B1440078@finisterre.ee.mobilebroadband> Date: Thu, 20 Sep 2018 18:36:09 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: rename for_each_rtd_codec_dai_reverse to rollback" 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: rename for_each_rtd_codec_dai_reverse to rollback 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 6d11b12879144da5f5aa08071a8a7f95f3b5a4e8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 18 Sep 2018 01:28:30 +0000 Subject: [PATCH] ASoC: rename for_each_rtd_codec_dai_reverse to rollback commit 0b7990e38971 ("ASoC: add for_each_rtd_codec_dai() macro") added for_each_rtd_codec_dai_reverse(). but _rollback() is better naming than _reverse(). This patch rename it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- include/sound/soc.h | 2 +- sound/soc/soc-pcm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.19.0 _______________________________________________ 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 1e093b399bc0..ec1ae9f4feeb 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1164,7 +1164,7 @@ struct snd_soc_pcm_runtime { for ((i) = 0; \ ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \ (i)++) -#define for_each_rtd_codec_dai_reverse(rtd, i, dai) \ +#define for_each_rtd_codec_dai_rollback(rtd, i, dai) \ for (; ((i--) >= 0) && ((dai) = rtd->codec_dais[i]);) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e387fff352c8..1eff1dbb0d00 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -621,7 +621,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) i = rtd->num_codecs; codec_dai_err: - for_each_rtd_codec_dai_reverse(rtd, i, codec_dai) { + for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) { if (codec_dai->driver->ops->shutdown) codec_dai->driver->ops->shutdown(substream, codec_dai); } @@ -1015,7 +1015,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, i = rtd->num_codecs; codec_err: - for_each_rtd_codec_dai_reverse(rtd, i, codec_dai) { + for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) { if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free(substream, codec_dai); codec_dai->rate = 0;