msm: clock: Use datatypes consistently to store clock rates
The clock API represents clock rates using unsigned longs,
whereas the clock drivers use an assortment of types (mostly
unsigned ints). Make consistent use of unsigned longs for rates.
Change-Id: I2e34d3d5db0ece40616d82274f60833aa70b7d5d
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-voter.c b/arch/arm/mach-msm/clock-voter.c
index e754752..56beca1 100644
--- a/arch/arm/mach-msm/clock-voter.c
+++ b/arch/arm/mach-msm/clock-voter.c
@@ -21,10 +21,10 @@
static DEFINE_SPINLOCK(voter_clk_lock);
/* Aggregate the rate of clocks that are currently on. */
-static unsigned voter_clk_aggregate_rate(const struct clk *parent)
+static unsigned long voter_clk_aggregate_rate(const struct clk *parent)
{
struct clk *clk;
- unsigned rate = 0;
+ unsigned long rate = 0;
list_for_each_entry(clk, &parent->children, siblings) {
struct clk_voter *v = to_clk_voter(clk);
@@ -34,13 +34,13 @@
return rate;
}
-static int voter_clk_set_rate(struct clk *clk, unsigned rate)
+static int voter_clk_set_rate(struct clk *clk, unsigned long rate)
{
int ret = 0;
unsigned long flags;
struct clk *clkp;
struct clk_voter *clkh, *v = to_clk_voter(clk);
- unsigned cur_rate, new_rate, other_rate = 0;
+ unsigned long cur_rate, new_rate, other_rate = 0;
spin_lock_irqsave(&voter_clk_lock, flags);
@@ -77,7 +77,7 @@
{
int ret = 0;
unsigned long flags;
- unsigned cur_rate;
+ unsigned long cur_rate;
struct clk *parent;
struct clk_voter *v = to_clk_voter(clk);
@@ -103,10 +103,9 @@
static void voter_clk_disable(struct clk *clk)
{
- unsigned long flags;
+ unsigned long flags, cur_rate, new_rate;
struct clk *parent;
struct clk_voter *v = to_clk_voter(clk);
- unsigned cur_rate, new_rate;
spin_lock_irqsave(&voter_clk_lock, flags);
parent = v->parent;
@@ -125,10 +124,9 @@
spin_unlock_irqrestore(&voter_clk_lock, flags);
}
-static unsigned voter_clk_get_rate(struct clk *clk)
+static unsigned long voter_clk_get_rate(struct clk *clk)
{
- unsigned rate;
- unsigned long flags;
+ unsigned long rate, flags;
struct clk_voter *v = to_clk_voter(clk);
spin_lock_irqsave(&voter_clk_lock, flags);
@@ -144,7 +142,7 @@
return v->enabled;
}
-static long voter_clk_round_rate(struct clk *clk, unsigned rate)
+static long voter_clk_round_rate(struct clk *clk, unsigned long rate)
{
struct clk_voter *v = to_clk_voter(clk);
return clk_round_rate(v->parent, rate);