[PATCH v2 3/7] clk: divider: switch to clk_div_mask()

[Andy Shevchenko]

Convert the code to use clk_div_mask() helper instead of div_mask() macro.

Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
---
 drivers/clk/clk-divider.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 25006a8..9cd3d8f 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -30,8 +30,6 @@
 
 #define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw)
 
-#define div_mask(width)        ((1 << (width)) - 1)
-
 static unsigned int _get_table_maxdiv(const struct clk_div_table *table)
 {
        unsigned int maxdiv = 0;
@@ -58,12 +56,12 @@ static unsigned int _get_maxdiv(const struct clk_div_table 
*table, u8 width,
                                unsigned long flags)
 {
        if (flags & CLK_DIVIDER_ONE_BASED)
-               return div_mask(width);
+               return clk_div_mask(width);
        if (flags & CLK_DIVIDER_POWER_OF_TWO)
-               return 1 << div_mask(width);
+               return 1 << clk_div_mask(width);
        if (table)
                return _get_table_maxdiv(table);
-       return div_mask(width) + 1;
+       return clk_div_mask(width) + 1;
 }
 
 static unsigned int _get_table_div(const struct clk_div_table *table,
@@ -138,7 +136,7 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw 
*hw,
        unsigned int val;
 
        val = clk_readl(divider->reg) >> divider->shift;
-       val &= div_mask(divider->width);
+       val &= clk_div_mask(divider->width);
 
        return divider_recalc_rate(hw, parent_rate, val, divider->table,
                                   divider->flags);
@@ -350,7 +348,7 @@ static long clk_divider_round_rate(struct clk_hw *hw, 
unsigned long rate,
        /* if read only, just return current value */
        if (divider->flags & CLK_DIVIDER_READ_ONLY) {
                bestdiv = readl(divider->reg) >> divider->shift;
-               bestdiv &= div_mask(divider->width);
+               bestdiv &= clk_div_mask(divider->width);
                bestdiv = _get_div(divider->table, bestdiv, divider->flags);
                return DIV_ROUND_UP(*prate, bestdiv);
        }
@@ -372,7 +370,7 @@ int divider_get_val(unsigned long rate, unsigned long 
parent_rate,
 
        value = _get_val(table, div, flags);
 
-       return min_t(unsigned int, value, div_mask(width));
+       return min_t(unsigned int, value, clk_div_mask(width));
 }
 EXPORT_SYMBOL_GPL(divider_get_val);
 
@@ -391,10 +389,10 @@ static int clk_divider_set_rate(struct clk_hw *hw, 
unsigned long rate,
                spin_lock_irqsave(divider->lock, flags);
 
        if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
-               val = div_mask(divider->width) << (divider->shift + 16);
+               val = clk_div_mask(divider->width) << (divider->shift + 16);
        } else {
                val = clk_readl(divider->reg);
-               val &= ~(div_mask(divider->width) << divider->shift);
+               val &= ~(clk_div_mask(divider->width) << divider->shift);
        }
        val |= value << divider->shift;
        clk_writel(val, divider->reg);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/