[MIPS] RB532: Flags are unsigned long
authorAdrian Bunk <bunk@kernel.org>
Tue, 29 Jul 2008 06:46:34 +0000 (09:46 +0300)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 30 Jul 2008 20:54:34 +0000 (21:54 +0100)
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>
arch/mips/rb532/gpio.c
arch/mips/rb532/time.c

index b2fe82dba0a561848e70aad5fee6a2a7bc834f1a..00a1c7877bf4c454e55ff41d507da678eb5f55b1 100644 (file)
@@ -64,7 +64,8 @@ static struct resource rb532_dev3_ctl_res[] = {
 
 void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val)
 {
-       unsigned flags, data;
+       unsigned long flags;
+       unsigned data;
        unsigned i = 0;
 
        spin_lock_irqsave(&dev3.lock, flags);
@@ -90,7 +91,7 @@ EXPORT_SYMBOL(get_434_reg);
 
 void set_latch_u5(unsigned char or_mask, unsigned char nand_mask)
 {
-       unsigned flags;
+       unsigned long flags;
 
        spin_lock_irqsave(&dev3.lock, flags);
 
index db74edf8cefb8cc96fca57386b93d9096ae3a58f..8e7a46855b50ad8fc5afe81e528d2e301c833a31 100644 (file)
@@ -49,8 +49,8 @@ static unsigned long __init cal_r4koff(void)
 
 void __init plat_time_init(void)
 {
-       unsigned int est_freq, flags;
-       unsigned long r4k_offset;
+       unsigned int est_freq;
+       unsigned long flags, r4k_offset;
 
        local_irq_save(flags);