Skip to contentSkip to conversation

Use the correct flags type where local_irq_save

PATCH In review Kyungmin Park 2 participants 2 messages Sep 17, 2007

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support
lore
Share & tools
lore

Kyungmin Park

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

arch/arm/mach-omap2/clock.c +4 -2
index acdcbe1..8e30202 100644
@@ -575,10 +575,11 @@ static long omap2_clk_round_rate(struct clk *clk, unsigned long rate)
 
 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);

@@ -947,9 +948,10 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 /* 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;
arch/arm/mach-omap2/memory.c +2 -1
index 089b559..008a0e4 100644
@@ -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;
maintainer
#1 lore raw
Quoted 40 lines · Kyungmin Park

[PATCH] Use the correct flags where the local_irq_save

We should use the 'unsigned long flags'.

Signed-off-by Kyungmin Park <[email protected]>

---

arch/arm/mach-omap2/clock.c +4 -2
index acdcbe1..8e30202 100644
@@ -575,10 +575,11 @@ static long omap2_clk_round_rate(struct clk *clk, unsigned long rate)
 
 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);

@@ -947,9 +948,10 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 /* 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;
arch/arm/mach-omap2/memory.c +0 -0
index 089b559..008a0e4 100644

arch/arm/mach-omap2/memory.c u32 omap2_dll_force_needed(void) · line 82

Quoted 9 lines
arch/arm/mach-omap2/memory.c +2 -1
@@ -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;

Pushing today, I refreshed it for Paul's patch for clock24xx.c

Hey great, no more wrapping in the patch!

Tony