Merge branches 'clk-renesas', 'clk-qcom', 'clk-mtk', 'clk-milbeaut' and 'clk-imx...

[sfrench/cifs-2.6.git] / drivers / clk / imx / clk-pll14xx.c

diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c
index 113d71042199b3d3599da84df07e932b1c7902a9..b7213023b238fdeadbf0548b17790432956483c4 100644 (file)
--- a/drivers/clk/imx/clk-pll14xx.c
+++ b/drivers/clk/imx/clk-pll14xx.c
@@ -74,10 +74,9 @@ static unsigned long clk_pll1416x_recalc_rate(struct clk_hw *hw,
                                                  unsigned long parent_rate)
 {
        struct clk_pll14xx *pll = to_clk_pll14xx(hw);
-       u32 mdiv, pdiv, sdiv, pll_gnrl, pll_div;
+       u32 mdiv, pdiv, sdiv, pll_div;
        u64 fvco = parent_rate;
 
-       pll_gnrl = readl_relaxed(pll->base);
        pll_div = readl_relaxed(pll->base + 4);
        mdiv = (pll_div & MDIV_MASK) >> MDIV_SHIFT;
        pdiv = (pll_div & PDIV_MASK) >> PDIV_SHIFT;
@@ -93,11 +92,10 @@ static unsigned long clk_pll1443x_recalc_rate(struct clk_hw *hw,
                                                  unsigned long parent_rate)
 {
        struct clk_pll14xx *pll = to_clk_pll14xx(hw);
-       u32 mdiv, pdiv, sdiv, pll_gnrl, pll_div_ctl0, pll_div_ctl1;
+       u32 mdiv, pdiv, sdiv, pll_div_ctl0, pll_div_ctl1;
        short int kdiv;
        u64 fvco = parent_rate;
 
-       pll_gnrl = readl_relaxed(pll->base);
        pll_div_ctl0 = readl_relaxed(pll->base + 4);
        pll_div_ctl1 = readl_relaxed(pll->base + 8);
        mdiv = (pll_div_ctl0 & MDIV_MASK) >> MDIV_SHIFT;