diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-29 02:46:34 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-30 16:54:34 -0400 |
commit | 8b32d6d00ca890ebb204da1260247c11bba042b3 (patch) | |
tree | 37bc0e424b0a9c6be366ef6c3726a23f17befc12 /arch/mips/rb532/gpio.c | |
parent | fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc (diff) |
[MIPS] RB532: Flags are unsigned long
A recent generic change now catches such bugs:
<-- snip -->
...
CC arch/mips/rb532/time.o
cc1: warnings being treated as errors
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/rb532/time.c: In function 'plat_time_init':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/rb532/time.c:55: error: comparison of distinct pointer types lacks a cast
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/rb532/time.c:66: error: comparison of distinct pointer types lacks a cast
make[2]: *** [arch/mips/rb532/time.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/rb532/gpio.c')
-rw-r--r-- | arch/mips/rb532/gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c index b2fe82dba0a5..00a1c7877bf4 100644 --- a/arch/mips/rb532/gpio.c +++ b/arch/mips/rb532/gpio.c | |||
@@ -64,7 +64,8 @@ static struct resource rb532_dev3_ctl_res[] = { | |||
64 | 64 | ||
65 | void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val) | 65 | void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val) |
66 | { | 66 | { |
67 | unsigned flags, data; | 67 | unsigned long flags; |
68 | unsigned data; | ||
68 | unsigned i = 0; | 69 | unsigned i = 0; |
69 | 70 | ||
70 | spin_lock_irqsave(&dev3.lock, flags); | 71 | spin_lock_irqsave(&dev3.lock, flags); |
@@ -90,7 +91,7 @@ EXPORT_SYMBOL(get_434_reg); | |||
90 | 91 | ||
91 | void set_latch_u5(unsigned char or_mask, unsigned char nand_mask) | 92 | void set_latch_u5(unsigned char or_mask, unsigned char nand_mask) |
92 | { | 93 | { |
93 | unsigned flags; | 94 | unsigned long flags; |
94 | 95 | ||
95 | spin_lock_irqsave(&dev3.lock, flags); | 96 | spin_lock_irqsave(&dev3.lock, flags); |
96 | 97 | ||