Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[sfrench/cifs-2.6.git] / drivers / clk / nxp / clk-lpc32xx.c

diff --git a/drivers/clk/nxp/clk-lpc32xx.c b/drivers/clk/nxp/clk-lpc32xx.c
index 5b98ff9076f34fcdbc58283bd7410e2e56b546a9..7b359afd620ec0ad23bb6bf2e41da28d5fd4e05a 100644 (file)
--- a/drivers/clk/nxp/clk-lpc32xx.c
+++ b/drivers/clk/nxp/clk-lpc32xx.c
@@ -885,7 +885,7 @@ static const struct clk_ops clk_usb_i2c_ops = {
        .recalc_rate = clk_usb_i2c_recalc_rate,
 };
 
-static int clk_gate_enable(struct clk_hw *hw)
+static int lpc32xx_clk_gate_enable(struct clk_hw *hw)
 {
        struct lpc32xx_clk_gate *clk = to_lpc32xx_gate(hw);
        u32 mask = BIT(clk->bit_idx);
@@ -894,7 +894,7 @@ static int clk_gate_enable(struct clk_hw *hw)
        return regmap_update_bits(clk_regmap, clk->reg, mask, val);
 }
 
-static void clk_gate_disable(struct clk_hw *hw)
+static void lpc32xx_clk_gate_disable(struct clk_hw *hw)
 {
        struct lpc32xx_clk_gate *clk = to_lpc32xx_gate(hw);
        u32 mask = BIT(clk->bit_idx);
@@ -903,7 +903,7 @@ static void clk_gate_disable(struct clk_hw *hw)
        regmap_update_bits(clk_regmap, clk->reg, mask, val);
 }
 
-static int clk_gate_is_enabled(struct clk_hw *hw)
+static int lpc32xx_clk_gate_is_enabled(struct clk_hw *hw)
 {
        struct lpc32xx_clk_gate *clk = to_lpc32xx_gate(hw);
        u32 val;
@@ -916,9 +916,9 @@ static int clk_gate_is_enabled(struct clk_hw *hw)
 }
 
 static const struct clk_ops lpc32xx_clk_gate_ops = {
-       .enable = clk_gate_enable,
-       .disable = clk_gate_disable,
-       .is_enabled = clk_gate_is_enabled,
+       .enable = lpc32xx_clk_gate_enable,
+       .disable = lpc32xx_clk_gate_disable,
+       .is_enabled = lpc32xx_clk_gate_is_enabled,
 };
 
 #define div_mask(width)        ((1 << (width)) - 1)