[PATCH v1 5/7] clk: ti: 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/ti/divider.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/clk/ti/divider.c b/drivers/clk/ti/divider.c
index 6211893..8a05e15 100644
--- a/drivers/clk/ti/divider.c
+++ b/drivers/clk/ti/divider.c
@@ -28,8 +28,6 @@
 
 #define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw)
 
-#define div_mask(d)    ((1 << ((d)->width)) - 1)
-
 static unsigned int _get_table_maxdiv(const struct clk_div_table *table)
 {
        unsigned int maxdiv = 0;
@@ -44,12 +42,12 @@ static unsigned int _get_table_maxdiv(const struct 
clk_div_table *table)
 static unsigned int _get_maxdiv(struct clk_divider *divider)
 {
        if (divider->flags & CLK_DIVIDER_ONE_BASED)
-               return div_mask(divider);
+               return clk_div_mask(divider);
        if (divider->flags & CLK_DIVIDER_POWER_OF_TWO)
-               return 1 << div_mask(divider);
+               return 1 << clk_div_mask(divider);
        if (divider->table)
                return _get_table_maxdiv(divider->table);
-       return div_mask(divider) + 1;
+       return clk_div_mask(divider) + 1;
 }
 
 static unsigned int _get_table_div(const struct clk_div_table *table,
@@ -103,7 +101,7 @@ static unsigned long ti_clk_divider_recalc_rate(struct 
clk_hw *hw,
        unsigned int div, val;
 
        val = ti_clk_ll_ops->clk_readl(divider->reg) >> divider->shift;
-       val &= div_mask(divider);
+       val &= clk_div_mask(divider);
 
        div = _get_div(divider, val);
        if (!div) {
@@ -225,17 +223,17 @@ static int ti_clk_divider_set_rate(struct clk_hw *hw, 
unsigned long rate,
        div = DIV_ROUND_UP(parent_rate, rate);
        value = _get_val(divider, div);
 
-       if (value > div_mask(divider))
-               value = div_mask(divider);
+       if (value > clk_div_mask(divider))
+               value = clk_div_mask(divider);
 
        if (divider->lock)
                spin_lock_irqsave(divider->lock, flags);
 
        if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
-               val = div_mask(divider) << (divider->shift + 16);
+               val = clk_div_mask(divider) << (divider->shift + 16);
        } else {
                val = ti_clk_ll_ops->clk_readl(divider->reg);
-               val &= ~(div_mask(divider) << divider->shift);
+               val &= ~(clk_div_mask(divider) << divider->shift);
        }
        val |= value << divider->shift;
        ti_clk_ll_ops->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/