From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756128AbbCaRXI (ORCPT ); Tue, 31 Mar 2015 13:23:08 -0400 Received: from mga11.intel.com ([192.55.52.93]:55243 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756059AbbCaRXB (ORCPT ); Tue, 31 Mar 2015 13:23:01 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,502,1422950400"; d="scan'208";a="700939222" 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 7/7] ARM: imx: switch to clk_div_mask() Date: Tue, 31 Mar 2015 20:22:27 +0300 Message-Id: <1427822547-163289-8-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 --- arch/arm/mach-imx/clk-fixup-div.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/clk-fixup-div.c b/arch/arm/mach-imx/clk-fixup-div.c index 21db020..e5a83bc 100644 --- a/arch/arm/mach-imx/clk-fixup-div.c +++ b/arch/arm/mach-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 > clk_div_mask(div->width)) + value = clk_div_mask(div->width); spin_lock_irqsave(div->lock, flags); val = readl(div->reg); - val &= ~(div_mask(div) << div->shift); + val &= ~(clk_div_mask(div->width) << div->shift); val |= value << div->shift; fixup_div->fixup(&val); writel(val, div->reg); -- 2.1.4