From patchwork Tue Jan 5 15:46:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 356873 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp230679ejs; Tue, 5 Jan 2021 07:47:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiNzcOsIPtC8Y/9xZhsXPXcBkqCjl8FXVX5zHi/7sNYpfLKp+vkQ0XqEoWW7NugX3+WNOa X-Received: by 2002:a05:6402:b57:: with SMTP id bx23mr318744edb.191.1609861663306; Tue, 05 Jan 2021 07:47:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609861663; cv=none; d=google.com; s=arc-20160816; b=mDhdr31+P3c3ammkEc79/nizsqlFD60zdwT414kIVRWo13FzTBGdwsAT2sfOPpYNya K34LiF9jtjL6KFmSo5MMydXPnX8EkQFm7BuqdEGCvZfYHW/sXn5r2C3M6x30TUDbXL+d DkWRvwWzM29N9ihsw/XjluY3twnT89GYOBHN9dIfxtwlAzWC+ktwXIgQUdZ4q4YhrpAv 1yT0D2ETeop5X7bY4AaRcPFPEhuSM1X31o27bbO2+Bon757U43KDMEUoShemanLQ+P7m SGlEo+pEU21X20N693Og8C83qgDu01TsBX1sOOzVbccDrds9qIUvU7OgDflxc44pY7fs QFpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=683W22EGa9sfpPqiD1cgo3Eou3RQzllrvaOP7U1PtVE=; b=Qx2cL70yH47e0LuqPI6t61riCvyhpcAF+o8Ho3dHB9OoQePy9LfbXE6yNkugsA1tFS 3Ux6m26XIZPIm5PYfl1OTJsnReWRClauncGr2nHefszYxGf2spG4luI0V23qYXa5WNyv yHueMiZFIE1JJldJS7fKrEXTJxIap8N3Lsv+RV4hGLFIaZ1gRlzBuIVDiojl0xaiMevA x1QQQJSq1Qywyqtz4v3zsy9ztVZ6Vo5gCJ8igHQbzQzHj+sxcjIqEaN5q4uPhbQ9u2IX HqQ5q+5+zh5Xe60a4hW3rurz7uxdF4STXeTSVT8J+xXMiuEIuBZdIJeVJkUxCEAwUf4p 4q3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tRB13fIp; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e23si29202453ejd.730.2021.01.05.07.47.43; Tue, 05 Jan 2021 07:47:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tRB13fIp; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728574AbhAEPrm (ORCPT + 15 others); Tue, 5 Jan 2021 10:47:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:34586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728307AbhAEPrm (ORCPT ); Tue, 5 Jan 2021 10:47:42 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id AA4B422C7C; Tue, 5 Jan 2021 15:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609861621; bh=6z7J0nXcSYPrbRD9ikeD2XiTuiVWtgpwGcxMh9Zj5v4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tRB13fIpS10pZLQfVcCXA7HjSg4EogCRrN7tPfPq9sDBJxSKxtq8eOo3ssr2SR4SX JqfxysHGoisknBLnQ3+RbE0PhWxRMQFSh5rUhMcRHwKpdccJxdeNw0qc3n7BGD16+1 DPfacV/UjIg3AruS1kg+4WkEMrG5NZW2z7PmZUYtxttQJ1UWIX6likneeUEW9Rq02O ybak7JVTxQnBciGIy3dNk36o3+F2T7XuEJ9bUCP03VO1sDeN5eqlsaeb+rCtUSyMA4 CtAspaaZe6CCS2RQS5PtNegNCCvf/ZORMxOSolEUlnYivQZod5K9HxBEqEcL13NtWf LrXVS5bPNjCkg== From: Vinod Koul To: Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Andy Gross , Michael Turquette , Rob Herring , Taniya Das , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] clk: qcom: clk-alpha-pll: replace regval with val Date: Tue, 5 Jan 2021 21:16:42 +0530 Message-Id: <20210105154645.217998-2-vkoul@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210105154645.217998-1-vkoul@kernel.org> References: <20210105154645.217998-1-vkoul@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Driver uses regval variable for holding register values, replace with a shorter one val Suggested-by: Stephen Boyd Signed-off-by: Vinod Koul --- drivers/clk/qcom/clk-alpha-pll.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.26.2 diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c index 21c357c26ec4..f7721088494c 100644 --- a/drivers/clk/qcom/clk-alpha-pll.c +++ b/drivers/clk/qcom/clk-alpha-pll.c @@ -777,15 +777,15 @@ static long alpha_pll_huayra_round_rate(struct clk_hw *hw, unsigned long rate, static int trion_pll_is_enabled(struct clk_alpha_pll *pll, struct regmap *regmap) { - u32 mode_regval, opmode_regval; + u32 mode_val, opmode_val; int ret; - ret = regmap_read(regmap, PLL_MODE(pll), &mode_regval); - ret |= regmap_read(regmap, PLL_OPMODE(pll), &opmode_regval); + ret = regmap_read(regmap, PLL_MODE(pll), &mode_val); + ret |= regmap_read(regmap, PLL_OPMODE(pll), &opmode_val); if (ret) return 0; - return ((opmode_regval & PLL_RUN) && (mode_regval & PLL_OUTCTRL)); + return ((opmode_val & PLL_RUN) && (mode_val & PLL_OUTCTRL)); } static int clk_trion_pll_is_enabled(struct clk_hw *hw) @@ -1445,12 +1445,12 @@ EXPORT_SYMBOL_GPL(clk_trion_pll_configure); static int __alpha_pll_trion_prepare(struct clk_hw *hw, u32 pcal_done) { struct clk_alpha_pll *pll = to_clk_alpha_pll(hw); - u32 regval; + u32 val; int ret; /* Return early if calibration is not needed. */ - regmap_read(pll->clkr.regmap, PLL_STATUS(pll), ®val); - if (regval & pcal_done) + regmap_read(pll->clkr.regmap, PLL_STATUS(pll), &val); + if (val & pcal_done) return 0; /* On/off to calibrate */ @@ -1476,7 +1476,7 @@ static int alpha_pll_trion_set_rate(struct clk_hw *hw, unsigned long rate, { struct clk_alpha_pll *pll = to_clk_alpha_pll(hw); unsigned long rrate; - u32 regval, l, alpha_width = pll_alpha_width(pll); + u32 val, l, alpha_width = pll_alpha_width(pll); u64 a; int ret; @@ -1497,8 +1497,8 @@ static int alpha_pll_trion_set_rate(struct clk_hw *hw, unsigned long rate, /* Wait for 2 reference cycles before checking the ACK bit. */ udelay(1); - regmap_read(pll->clkr.regmap, PLL_MODE(pll), ®val); - if (!(regval & ALPHA_PLL_ACK_LATCH)) { + regmap_read(pll->clkr.regmap, PLL_MODE(pll), &val); + if (!(val & ALPHA_PLL_ACK_LATCH)) { pr_err("Lucid PLL latch failed. Output may be unstable!\n"); return -EINVAL; }