From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869AbbGMOH5 (ORCPT ); Mon, 13 Jul 2015 10:07:57 -0400 Received: from mga01.intel.com ([192.55.52.88]:9088 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751117AbbGMOHz (ORCPT ); Mon, 13 Jul 2015 10:07:55 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,462,1432623600"; d="scan'208";a="761486776" 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 8/8] ARM: imx: switch to GENMASK() Date: Mon, 13 Jul 2015 17:07:48 +0300 Message-Id: <1436796468-45723-9-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/imx/clk-fixup-div.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-fixup-div.c b/drivers/clk/imx/clk-fixup-div.c index 21db020..cd9a843 100644 --- a/drivers/clk/imx/clk-fixup-div.c +++ b/drivers/clk/imx/clk-fixup-div.c @@ -16,7 +16,6 @@ #include "clk.h" #define to_clk_div(_hw) container_of(_hw, struct clk_divider, hw) -#define div_mask(d) ((1 << (d->width)) - 1) /** * struct clk_fixup_div - imx integer fixup divider clock @@ -70,13 +69,13 @@ static int clk_fixup_div_set_rate(struct clk_hw *hw, unsigned long rate, /* Zero based divider */ value = divider - 1; - if (value > div_mask(div)) - value = div_mask(div); + if (value > GENMASK(div->width - 1, 0)) + value = GENMASK(div->width - 1, 0); spin_lock_irqsave(div->lock, flags); val = readl(div->reg); - val &= ~(div_mask(div) << div->shift); + val &= ~(GENMASK(div->width - 1, 0) << div->shift); val |= value << div->shift; fixup_div->fixup(&val); writel(val, div->reg); -- 2.1.4