From 6aefe180a8c3b083dd37bdd7e886516ad8975751 Mon Sep 17 00:00:00 2001 From: James Hogan Date: Tue, 15 Jan 2013 10:28:05 +0000 Subject: [PATCH] --- yaml --- r: 350733 b: refs/heads/master c: 1a3cd18475a98b9587a181b8d8ebc7f5cdedb4b0 h: refs/heads/master i: 350731: 543122c6ca4349ca47f8c48d220ea64aceab7de7 v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-divider.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d342aeea8900..b8d892bc4b7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb8b8f2e7164b819ca35a3d6240198fdb98d0ef3 +refs/heads/master: 1a3cd18475a98b9587a181b8d8ebc7f5cdedb4b0 diff --git a/trunk/drivers/clk/clk-divider.c b/trunk/drivers/clk/clk-divider.c index a9204c69148d..68b402101170 100644 --- a/trunk/drivers/clk/clk-divider.c +++ b/trunk/drivers/clk/clk-divider.c @@ -16,6 +16,7 @@ #include #include #include +#include /* * DOC: basic adjustable divider clock that cannot gate @@ -29,8 +30,7 @@ #define to_clk_divider(_hw) container_of(_hw, struct clk_divider, hw) -#define div_mask(d) ((1 << (d->width)) - 1) -#define is_power_of_two(i) !(i & ~i) +#define div_mask(d) ((1 << ((d)->width)) - 1) static unsigned int _get_table_maxdiv(const struct clk_div_table *table) { @@ -137,7 +137,7 @@ static bool _is_valid_table_div(const struct clk_div_table *table, static bool _is_valid_div(struct clk_divider *divider, unsigned int div) { if (divider->flags & CLK_DIVIDER_POWER_OF_TWO) - return is_power_of_two(div); + return is_power_of_2(div); if (divider->table) return _is_valid_table_div(divider->table, div); return true;