From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751973AbbGMOIX (ORCPT ); Mon, 13 Jul 2015 10:08:23 -0400 Received: from mga11.intel.com ([192.55.52.93]:52398 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751813AbbGMOH5 (ORCPT ); Mon, 13 Jul 2015 10:07:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,462,1432623600"; d="scan'208";a="763481397" 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 v5 6/8] clk: hisilicon: switch to GENMASK() Date: Mon, 13 Jul 2015 17:07:46 +0300 Message-Id: <1436796468-45723-7-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436796468-45723-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1436796468-45723-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 GENMASK() helper instead of div_mask() macro. Signed-off-by: Andy Shevchenko --- drivers/clk/hisilicon/clkdivider-hi6220.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/clk/hisilicon/clkdivider-hi6220.c b/drivers/clk/hisilicon/clkdivider-hi6220.c index 113eee8..65ab03f 100644 --- a/drivers/clk/hisilicon/clkdivider-hi6220.c +++ b/drivers/clk/hisilicon/clkdivider-hi6220.c @@ -18,8 +18,6 @@ #include #include -#define div_mask(width) ((1 << (width)) - 1) - /** * struct hi6220_clk_divider - divider clock for hi6220 * @@ -51,7 +49,7 @@ static unsigned long hi6220_clkdiv_recalc_rate(struct clk_hw *hw, struct hi6220_clk_divider *dclk = to_hi6220_clk_divider(hw); val = readl_relaxed(dclk->reg) >> dclk->shift; - val &= div_mask(dclk->width); + val &= GENMASK(dclk->width - 1, 0); return divider_recalc_rate(hw, parent_rate, val, dclk->table, CLK_DIVIDER_ROUND_CLOSEST); @@ -81,7 +79,7 @@ static int hi6220_clkdiv_set_rate(struct clk_hw *hw, unsigned long rate, spin_lock_irqsave(dclk->lock, flags); data = readl_relaxed(dclk->reg); - data &= ~(div_mask(dclk->width) << dclk->shift); + data &= ~(GENMASK(dclk->width - 1, 0) << dclk->shift); data |= value << dclk->shift; data |= dclk->mask; @@ -116,7 +114,7 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name, return ERR_PTR(-ENOMEM); /* Init the divider table */ - max_div = div_mask(width) + 1; + max_div = BIT(width); min_div = 1; table = kcalloc(max_div + 1, sizeof(*table), GFP_KERNEL); -- 2.1.4