From 648aaa527b29f7608728370b80051af4b146a8db Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Mon, 17 Sep 2007 16:41:03 +0900 Subject: [PATCH] Use the correct flags type where local_irq_save [PATCH] Use the correct flags where the local_irq_save We should use the 'unsigned long flags'. Signed-off-by: Kyungmin Park Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/clock24xx.c | 6 ++++-- arch/arm/mach-omap2/memory.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index db941400acc..b792589e88e 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c @@ -178,10 +178,11 @@ static void omap2_dpll_recalc(struct clk *clk) static int omap2_reprogram_dpll(struct clk *clk, unsigned long rate) { - u32 flags, cur_rate, low, mult, div, valid_rate, done_rate; + u32 cur_rate, low, mult, div, valid_rate, done_rate; u32 bypass = 0; struct prcm_config tmpset; const struct dpll_data *dd; + unsigned long flags; int ret = -EINVAL; local_irq_save(flags); @@ -295,9 +296,10 @@ static long omap2_round_to_table_rate(struct clk *clk, unsigned long rate) /* Sets basic clocks based on the specified rate */ static int omap2_select_table_rate(struct clk *clk, unsigned long rate) { - u32 flags, cur_rate, done_rate, bypass = 0, tmp; + u32 cur_rate, done_rate, bypass = 0, tmp; struct prcm_config *prcm; unsigned long found_speed = 0; + unsigned long flags; if (clk != &virt_prcm_set) return -EINVAL; diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 089b559f6a9..008a0e4f9ab 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c @@ -75,7 +75,8 @@ u32 omap2_dll_force_needed(void) u32 omap2_reprogram_sdrc(u32 level, u32 force) { u32 dll_ctrl, m_type; - u32 prev = curr_perf_level, flags; + u32 prev = curr_perf_level; + unsigned long flags; if ((curr_perf_level == level) && !force) return prev; -- 2.41.1