clk: qcom: clk-alpha-pll: replace regval with val

Driver uses regval variable for holding register values, replace with a
shorter one val

Suggested-by: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20210127070811.152690-2-vkoul@kernel.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
index 21c357c26ec42a8e98d505d48dc62c4eaa569ef2..f7721088494c032df50ecef4d8fea0ec0c5faeeb 100644 (file)
--- 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), &regval);
-       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), &regval);
-       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;
        }