[PATCH v5 2/8] clk: mmp: switch to GENMASK()

From: Andy Shevchenko
Date: Mon Jul 13 2015 - 10:09:09 EST


Convert the code to use GENMASK() helper instead of custom approach.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/clk/mmp/clk-mix.c | 2 +-
drivers/clk/mmp/clk.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c
index 7a37432..1ff85d7c 100644
--- a/drivers/clk/mmp/clk-mix.c
+++ b/drivers/clk/mmp/clk-mix.c
@@ -26,7 +26,7 @@

static unsigned int _get_maxdiv(struct mmp_clk_mix *mix)
{
- unsigned int div_mask = (1 << mix->reg_info.width_div) - 1;
+ unsigned int div_mask = GENMASK(mix->reg_info.width_div - 1, 0);
unsigned int maxdiv = 0;
struct clk_div_table *clkt;

diff --git a/drivers/clk/mmp/clk.h b/drivers/clk/mmp/clk.h
index adf9b71..f5fdb0e 100644
--- a/drivers/clk/mmp/clk.h
+++ b/drivers/clk/mmp/clk.h
@@ -39,7 +39,7 @@ extern struct clk *mmp_clk_register_factor(const char *name,

/* Clock type "mix" */
#define MMP_CLK_BITS_MASK(width, shift) \
- (((1 << (width)) - 1) << (shift))
+ (GENMASK((width) - 1, 0) << (shift))
#define MMP_CLK_BITS_GET_VAL(data, width, shift) \
((data & MMP_CLK_BITS_MASK(width, shift)) >> (shift))
#define MMP_CLK_BITS_SET_VAL(val, width, shift) \
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/