From patchwork Mon Dec 4 20:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 10091579 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 8BEA86035E for ; Mon, 4 Dec 2017 20:49:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EC782879A for ; Mon, 4 Dec 2017 20:49:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 739EB28D24; Mon, 4 Dec 2017 20:49:49 +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 C20642879A for ; Mon, 4 Dec 2017 20:49:48 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0892F2676C5; Mon, 4 Dec 2017 21:47:42 +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 008662676B2; Mon, 4 Dec 2017 21:47:39 +0100 (CET) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by alsa0.perex.cz (Postfix) with ESMTP id 61346267654 for ; Mon, 4 Dec 2017 21:47:31 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id c204so9432891pfc.13 for ; Mon, 04 Dec 2017 12:47:31 -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=tndC6gjhwk7h6y2ERnWA/RzWSHU/ktoIYfAfZuS1tCQ=; b=t3Wm7/flQW0qcQRSoZnpsGD/ljI413jlBOw606Kq9TPjE1qp/7CwHa1QzB12HIAezn dzfLg3dkUUEzvdWMb+MfeQfhnfXCT0meaoFFbO+YVdN/EKLh3idTx6FWXTpKVsu7JrXa pR0PagezSIzdgw+FVNuPPIe2UMI/XyRwgQtWoTl1DLGkVc7SZ+QY5Bs46pnEpnz3SDse jy2XSHwP8z+FjABk+ePG4qCJztYTa17gtCvodcqgmRalPFXdH0n5bYFJxjyTdwKok0Zq n0k9OUewG8Sna/LNFXGSWzNIjxXd0me2jyuwIDJEdy2vnpY5b/oSiq8I1T+GWw82hOm8 VOBg== 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=tndC6gjhwk7h6y2ERnWA/RzWSHU/ktoIYfAfZuS1tCQ=; b=VfW2bakgPsm6Putv93HR3xcKAg6ADc4iZY4jiZO1OmwYVC51znLihUeZ8ZteQnqurY WHfc6pn34/+6QMEXVI6LWVE1B5hMGo0FO6UDWyw1wM+HF7XFKqoLW1wc/JACaJULjVuZ mvxQleeoeekyYbu7aCf3iH+c8ZNUmlOQkHbc52txb3gIcFXa5iDUQkP94zbyQ5H2xUIy RL6WtdJuwVOPVVwt/lE6xe8GoJlxhh5VIp7LEaUOPubo+sIrL9n7AHADdycRY+q3zSHo DGnp8VrVDvlMXEWrU2MTryhXlst8g4tmhdTtjP+ayJM4tdMPgd/SK8bGB7g+kJS0C0Ub DTSA== X-Gm-Message-State: AJaThX7hLOmaQu8eWj9EjUbIcmb9AEW209bq9BgyRM7ruqm+MQVJFo6c lomcJqWTpoOo1KHyLb/De9s= X-Google-Smtp-Source: AGs4zMaXmXeKxhXTJRhnjVrrvtI14K6sFylFmeteH4/Ccr2gO7jijuUUkCmPpQl1R5kjsnGWrFlBOg== X-Received: by 10.101.68.129 with SMTP id l1mr14921422pgq.53.1512420450075; Mon, 04 Dec 2017 12:47:30 -0800 (PST) Received: from Asurada-Nvidia.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id c11sm22263895pgv.42.2017.12.04.12.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 12:47:29 -0800 (PST) From: Nicolin Chen To: broonie@kernel.org Date: Mon, 4 Dec 2017 12:46:42 -0800 Message-Id: <1512420403-10164-10-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1512420403-10164-1-git-send-email-nicoleotsuka@gmail.com> References: <1512420403-10164-1-git-send-email-nicoleotsuka@gmail.com> Cc: mail@maciej.szmigiero.name, timur@tabi.org, lgirdwood@gmail.com, alsa-devel@alsa-project.org, caleb@crome.org, linux-kernel@vger.kernel.org, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] [PATCH 09/10] 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 10f6b63..55f6a1f 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -444,12 +444,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; @@ -785,11 +785,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)