[PATCH] proper flags type of spin_lock_irqsave()

Convert various spin_lock_irqsave() callers to correctly use `unsigned long'.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
index 21c8229f5443..6d58b0370802 100644
--- a/drivers/char/ds1286.c
+++ b/drivers/char/ds1286.c
@@ -104,7 +104,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
         switch (cmd) {
         case RTC_AIE_OFF:       /* Mask alarm int. enab. bit    */
         {
-                unsigned int flags;
+                unsigned long flags;
                 unsigned char val;
 
                 if (!capable(CAP_SYS_TIME))
@@ -120,7 +120,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
         }
         case RTC_AIE_ON:        /* Allow alarm interrupts.      */
         {
-                unsigned int flags;
+                unsigned long flags;
                 unsigned char val;
 
                 if (!capable(CAP_SYS_TIME))
@@ -136,7 +136,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
         }
         case RTC_WIE_OFF:       /* Mask watchdog int. enab. bit */
         {
-                unsigned int flags;
+                unsigned long flags;
                 unsigned char val;
 
                 if (!capable(CAP_SYS_TIME))
@@ -152,7 +152,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
         }
         case RTC_WIE_ON:        /* Allow watchdog interrupts.   */
         {
-                unsigned int flags;
+                unsigned long flags;
                 unsigned char val;
 
                 if (!capable(CAP_SYS_TIME))
@@ -434,7 +434,7 @@ static inline unsigned char ds1286_is_updating(void)
 static void ds1286_get_time(struct rtc_time *rtc_tm)
 {
         unsigned char save_control;
-        unsigned int flags;
+        unsigned long flags;
         unsigned long uip_watchdog = jiffies;
 
         /*
@@ -494,7 +494,8 @@ static int ds1286_set_time(struct rtc_time *rtc_tm)
 {
         unsigned char mon, day, hrs, min, sec, leap_yr;
         unsigned char save_control;
-        unsigned int yrs, flags;
+        unsigned int yrs;
+        unsigned long flags;
 
 
         yrs = rtc_tm->tm_year + 1900;
@@ -552,7 +553,7 @@ static int ds1286_set_time(struct rtc_time *rtc_tm)
 static void ds1286_get_alm_time(struct rtc_time *alm_tm)
 {
         unsigned char cmd;
-        unsigned int flags;
+        unsigned long flags;
 
         /*
          * Only the values that we read from the RTC are set. That
diff --git a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c
index d82e6dae8407..559a62b04ee9 100644
--- a/drivers/i2c/busses/i2c-ite.c
+++ b/drivers/i2c/busses/i2c-ite.c
@@ -109,7 +109,7 @@ static int iic_ite_getclock(void *data)
 static void iic_ite_waitforpin(void) {
    DEFINE_WAIT(wait);
    int timeout = 2;
-   long flags;
+   unsigned long flags;
 
    /* If interrupts are enabled (which they are), then put the process to
     * sleep.  This process will be awakened by two events -- either the