From patchwork Wed Dec 13 06:34:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10109319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE75A602C2 for ; Wed, 13 Dec 2017 06:37:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB0341FF40 for ; Wed, 13 Dec 2017 06:37:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFB0928D11; Wed, 13 Dec 2017 06:37:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B91F1FF40 for ; Wed, 13 Dec 2017 06:37:26 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3F62D267863; Wed, 13 Dec 2017 07:35:49 +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 EF6F5267823; Wed, 13 Dec 2017 07:35:47 +0100 (CET) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by alsa0.perex.cz (Postfix) with ESMTP id 02062267838 for ; Wed, 13 Dec 2017 07:35:42 +0100 (CET) Received: by mail-pg0-f68.google.com with SMTP id y6so878899pgp.4 for ; Tue, 12 Dec 2017 22:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WaY5U6msQc2FrbD8m4OhcfMW1nLYpIq3AJZI5oVKvJE=; b=DEQC5AZcF+5UJUnNjr/9ryHR5RS36EYD4i6X0fRvbBKiNYw5ER+zkyisWW9ZM1Ihj1 7PlqrT+NWgEAyj8dP1hUeerhj/oC6IPzMDKXEwnmhsa1GV9aEQvBAzwIMFN87EUv2FpV RRfazxm4YER4TQaXgjV3a9/LVFrrmlnjAxGddzz0T9O3IsS2wqG3gJ7+0CLnMvqEdhGZ QiUOc0ikEffh4f2EvHyl7M5FTkPfLflNPhIqZbwXWlH6KlY/VqF+xjJPYy15jEC/r7ce 1/LOdLYUJte9+IXAIqvte4nlyqTHytqWTspayCRBWzgGac9DXGdbQdeNvlICXaxsyZxC YUYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WaY5U6msQc2FrbD8m4OhcfMW1nLYpIq3AJZI5oVKvJE=; b=AurPamYJoOLSO/FiaBufFBSfPOUxANLQyzTCroVeqEaKvhbFgQx45RFGityS6eFxEf IQ2ORdk48YnsC377YZ1FOc86yvNk3h4q52X2FOpdLTz7mKIU8CcmRqQHZtnr4Ofqb95a Olt3wUSYKNOCHbbG2aLOEYISvQ40UN2H7TyLxZv9xdI6Y2noZEQNE4Gmj646GgDZNmed p1ThIi3GjfTM9XIUeMXJS7a5LExE61MLVvdZXQ7Mn93P9tHZCK8+8sjXhbosY5Gmme/U RdZwwgpPLd4u5IZxesOR9OCBqMcEsVUSUzyti/YO5u4JqOqZK+dvImTLRPp0tr6u3wEy 3hpQ== X-Gm-Message-State: AKGB3mJkxccND++0q40DBhhCljtBRNW3I4XzYtHknwxoC2ij416rHXk6 1a9k2FU4+dhy+tUq0Rz+Aiw= X-Google-Smtp-Source: ACJfBos1Icr4vzpH7yNTV4eajL8K0izWnw6hKdvZ8fh8t156bLmHW/r6MKVvJ5n6wDzNLAiOwCZqrw== X-Received: by 10.101.83.133 with SMTP id x5mr4332775pgq.175.1513146941650; Tue, 12 Dec 2017 22:35:41 -0800 (PST) Received: from Asurada-CZ80.localdomain (c-73-231-2-134.hsd1.ca.comcast.net. [73.231.2.134]) by smtp.gmail.com with ESMTPSA id m63sm1574900pfj.80.2017.12.12.22.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Dec 2017 22:35:40 -0800 (PST) From: Nicolin Chen To: broonie@kernel.org Date: Tue, 12 Dec 2017 22:34:31 -0800 Message-Id: <1513146874-25476-9-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513146874-25476-1-git-send-email-nicoleotsuka@gmail.com> References: <1513146874-25476-1-git-send-email-nicoleotsuka@gmail.com> Cc: alsa-devel@alsa-project.org, kernel@pengutronix.de, lgirdwood@gmail.com, timur@tabi.org, caleb@crome.org, linux-kernel@vger.kernel.org, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, mail@maciej.szmigiero.name, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] [PATCH v2 08/11] ASoC: fsl_ssi: Rename scr_val to scr 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 Simplify the variable name. This reduces one over-80-character line. Signed-off-by: Nicolin Chen --- sound/soc/fsl/fsl_ssi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 69fa86d..7fcc6bd 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -448,12 +448,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; @@ -795,11 +795,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; /* To support simultaneous TX and RX, bypass it if SSI is enabled */ if (enabled && ssi->cpu_dai_drv.symmetric_rates)