From patchwork Tue Dec 19 10:59:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 122370 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3989449qgn; Tue, 19 Dec 2017 03:00:38 -0800 (PST) X-Google-Smtp-Source: ACJfBotHKWedfFlfCaPU2WmJL0YCKq1fgHspqIzKNOtUTvkGKRpQOwOfj16Elz8pOIdxaFEtGm02 X-Received: by 10.223.196.71 with SMTP id a7mr4783686wrg.158.1513681238085; Tue, 19 Dec 2017 03:00:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513681238; cv=none; d=google.com; s=arc-20160816; b=nr2/MTPSbgAVqObp8TpcCt2+UMZtaUK+tOzXZA5cVuUDvLNgticMEWUBFpeAJFVskD 3klrwWt2kqRrdEzmVXdQ93YXGTXMgoHcVwOwoHRYYiMbVR/yxwJlsABGcuzIBE2J0SiM e82sYtpnVbUczvBTvp7GHDJPsF3m7D240IHm4OjP7dHudCaFojBrtW9G5ayr3Zpr2raJ FCqRNWIi5pzquQDYI5jo/dhPQdCjeBiQyuNrFuCICHEZ9d40YAJqlCH4rGOe5WsDLdnN SrxfKi7N3LtYcmfHG54MfDOotet1wF/mIJ6Q3ZAL2EOtMcPOwNjrQwaOGPTSoC8JOwxK ULfA== 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=2aDE9xuD+qKyWQWkSp41o69yoYWjBphzKm5PH6NUDxY=; b=UQEoAdSM/V/QcIsOKCZP5O3LTXf2mL4DNYFulCsDi88ijF1lOZcDe18p/2xsFSsugL wCWtVhCjeR44AhwlstiAy/PFtin+Mf0R7OPvNBJa0wyf7qx5ka4ZSppor3Wsj/5oZ9hB f00VuOqUoE7daCbwBzDMVwRlVEGT6UnTqOlQx4T50oeLl85UnajbL+EjLglN1bKXKIqi +3k342Dfn8VXJxu7aWRYrEY4DDjN2KKGTb8P3G4dkRVv+XAJrTctt4hHJpAkrTYSojvI c6x/+c1gHkXnK8aQ9e60CwQLpX131DSRRMoU+NEkqWCV0dwG9G6Gil4feLZCLAXOSG8z 99pg== 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=eaJ4DmYt; 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 3si5156612wrh.544.2017.12.19.03.00.37; Tue, 19 Dec 2017 03:00:38 -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=eaJ4DmYt; 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 359EA2676CE; Tue, 19 Dec 2017 12:00:08 +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 37C882676CF; Tue, 19 Dec 2017 12:00:06 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 67B632676B4 for ; Tue, 19 Dec 2017 11:59:50 +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=iFbIYzr0/2KJBYiGeQiieuoYBYgnT50CIPsuBo7WOR8=; b=eaJ4DmYtE9YH de/B+kWPstkwJ+0myZGEXEHxoEZ+9Slbem5CYyuxEdZjM3Smi5oqw16n378/I7vGZ4eutiqa2Q2fL KT0T5m36IpPd7Fw5fa+KAfsrTER3cwuIimieW7fQEXMbeUQEvuhI5MiRake+1KWYMvALba6qUVT7B 8ck0Y=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eRFcf-0003Xv-Jf; Tue, 19 Dec 2017 10:59:45 +0000 Received: from broonie by debutante with local (Exim 4.90_RC3) (envelope-from ) id 1eRFcf-0000tY-5V; Tue, 19 Dec 2017 10:59:45 +0000 From: Mark Brown To: Nicolin Chen In-Reply-To: <1513207108-30430-9-git-send-email-nicoleotsuka@gmail.com> Message-Id: Date: Tue, 19 Dec 2017 10:59:45 +0000 Cc: alsa-devel@alsa-project.org, arnaud.mouiche@invoxia.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, mail@maciej.szmigiero.name, caleb@crome.org, timur@tabi.org, broonie@kernel.org, kernel@pengutronix.de, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] Applied "ASoC: fsl_ssi: Rename scr_val to scr" 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: fsl_ssi: Rename scr_val to scr 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 ff4adb090066c1636a43b88a497c34d2bd2312ec Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Sun, 17 Dec 2017 18:52:07 -0800 Subject: [PATCH] ASoC: fsl_ssi: Rename scr_val to scr Simplify the variable name. This reduces one over-80-character line. Signed-off-by: Nicolin Chen Tested-by: Maciej S. Szmigiero Reviewed-by: Maciej S. Szmigiero Acked-by: Timur Tabi Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_ssi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.15.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 237302fb9279..af3ba718d4bb 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -451,12 +451,12 @@ static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, struct regmap *regs = ssi->regs; struct fsl_ssi_reg_val *avals; int nr_active_streams; - u32 scr_val; + u32 scr; int keep_active; - regmap_read(regs, REG_SSI_SCR, &scr_val); + regmap_read(regs, REG_SSI_SCR, &scr); - nr_active_streams = !!(scr_val & SSI_SCR_TE) + !!(scr_val & SSI_SCR_RE); + nr_active_streams = !!(scr & SSI_SCR_TE) + !!(scr & SSI_SCR_RE); if (nr_active_streams - 1 > 0) keep_active = 1; @@ -810,11 +810,11 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, unsigned int sample_size = params_width(hw_params); u32 wl = SSI_SxCCR_WL(sample_size); int ret; - u32 scr_val; + u32 scr; int enabled; - regmap_read(regs, REG_SSI_SCR, &scr_val); - enabled = scr_val & SSI_SCR_SSIEN; + regmap_read(regs, REG_SSI_SCR, &scr); + enabled = scr & SSI_SCR_SSIEN; /* * SSI is properly configured if it is enabled and running in