Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Adrian Bunk and committed by
Ralf Baechle
8b32d6d0 fd7ccfa7

+5 -4
+3 -2
arch/mips/rb532/gpio.c
··· 64 64 65 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 69 unsigned i = 0; 69 70 70 71 spin_lock_irqsave(&dev3.lock, flags); ··· 91 90 92 91 void set_latch_u5(unsigned char or_mask, unsigned char nand_mask) 93 92 { 94 - unsigned flags; 93 + unsigned long flags; 95 94 96 95 spin_lock_irqsave(&dev3.lock, flags); 97 96
+2 -2
arch/mips/rb532/time.c
··· 49 49 50 50 void __init plat_time_init(void) 51 51 { 52 - unsigned int est_freq, flags; 53 - unsigned long r4k_offset; 52 + unsigned int est_freq; 53 + unsigned long flags, r4k_offset; 54 54 55 55 local_irq_save(flags); 56 56