From f31f05bffae3e72536f77f6c46d511def09d1895 Mon Sep 17 00:00:00 2001 From: Vivek Aknurwar Date: Tue, 18 Feb 2020 16:53:16 -0800 Subject: [PATCH] clk: qcom: clk-alpha-pll: Remove already enabled warning in PLL configs It is expected that PLLs are already enabled since boot usually enable PLLs. clk_hw_get_name can't be used in clock pre-registration stage since hw->core will be NULL. PLL already enabled warning is valid in enable path. Change-Id: I9040426f2803e5a413d919b143de6fa59098b09b Signed-off-by: Vivek Aknurwar --- drivers/clk/qcom/clk-alpha-pll.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c index cdddd8159b3c..35af4070446e 100644 --- a/drivers/clk/qcom/clk-alpha-pll.c +++ b/drivers/clk/qcom/clk-alpha-pll.c @@ -986,13 +986,8 @@ int clk_zonda_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, int ret; ret = __zonda_pll_is_enabled(pll, regmap); - if (ret < 0) + if (ret) return ret; - else if (ret) { - pr_warn("%s PLL is already enabled\n", - clk_hw_get_name(&pll->clkr.hw)); - return 0; - } if (config->l) ret |= regmap_write(regmap, PLL_L_VAL(pll), config->l); @@ -1942,13 +1937,8 @@ void clk_lucid_pll_configure(struct clk_alpha_pll *pll, struct regmap *regmap, int ret; ret = lucid_pll_is_enabled(pll, regmap); - if (ret < 0) + if (ret) return; - else if (ret) { - pr_warn("%s PLL is already enabled\n", - clk_hw_get_name(&pll->clkr.hw)); - return; - } if (config->l) regmap_write(regmap, PLL_L_VAL(pll), config->l); @@ -2222,13 +2212,8 @@ int clk_lucid_5lpe_pll_configure(struct clk_alpha_pll *pll, int ret; ret = lucid_pll_is_enabled(pll, regmap); - if (ret < 0) + if (ret) return ret; - else if (ret) { - pr_warn("%s PLL is already enabled\n", - clk_hw_get_name(&pll->clkr.hw)); - return 0; - } if (config->l) ret |= regmap_write(regmap, PLL_L_VAL(pll), config->l);