From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756085AbbCaRWk (ORCPT ); Tue, 31 Mar 2015 13:22:40 -0400 Received: from mga02.intel.com ([134.134.136.20]:46703 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756066AbbCaRWg (ORCPT ); Tue, 31 Mar 2015 13:22:36 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,502,1422950400"; d="scan'208";a="475012923" From: Andy Shevchenko To: linux-kernel@vger.kernel.org, Sascha Hauer , Peter De Schrijver , Tero Kristo , Stephen Boyd , Russell King , Dinh Nguyen Cc: Andy Shevchenko Subject: [PATCH v3 5/7] clk: ti: divider: switch to clk_div_mask() Date: Tue, 31 Mar 2015 20:22:25 +0300 Message-Id: <1427822547-163289-6-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427822547-163289-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1427822547-163289-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert the code to use clk_div_mask() helper instead of div_mask() macro. Signed-off-by: Andy Shevchenko --- 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..d73f7ae 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->width); if (divider->flags & CLK_DIVIDER_POWER_OF_TWO) - return 1 << div_mask(divider); + return 1 << clk_div_mask(divider->width); if (divider->table) return _get_table_maxdiv(divider->table); - return div_mask(divider) + 1; + return clk_div_mask(divider->width) + 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->width); 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->width)) + value = clk_div_mask(divider->width); 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->width) << (divider->shift + 16); } else { val = ti_clk_ll_ops->clk_readl(divider->reg); - val &= ~(div_mask(divider) << divider->shift); + val &= ~(clk_div_mask(divider->width) << divider->shift); } val |= value << divider->shift; ti_clk_ll_ops->clk_writel(val, divider->reg); -- 2.1.4