[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>
This commit is contained in:
committed by
Ralf Baechle
parent
fd7ccfa7ac
commit
8b32d6d00c
@@ -64,7 +64,8 @@ static struct resource rb532_dev3_ctl_res[] = {
|
|||||||
|
|
||||||
void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val)
|
void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val)
|
||||||
{
|
{
|
||||||
unsigned flags, data;
|
unsigned long flags;
|
||||||
|
unsigned data;
|
||||||
unsigned i = 0;
|
unsigned i = 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&dev3.lock, flags);
|
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)
|
void set_latch_u5(unsigned char or_mask, unsigned char nand_mask)
|
||||||
{
|
{
|
||||||
unsigned flags;
|
unsigned long flags;
|
||||||
|
|
||||||
spin_lock_irqsave(&dev3.lock, flags);
|
spin_lock_irqsave(&dev3.lock, flags);
|
||||||
|
|
||||||
|
@@ -49,8 +49,8 @@ static unsigned long __init cal_r4koff(void)
|
|||||||
|
|
||||||
void __init plat_time_init(void)
|
void __init plat_time_init(void)
|
||||||
{
|
{
|
||||||
unsigned int est_freq, flags;
|
unsigned int est_freq;
|
||||||
unsigned long r4k_offset;
|
unsigned long flags, r4k_offset;
|
||||||
|
|
||||||
local_irq_save(flags);
|
local_irq_save(flags);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user