diff options
Diffstat (limited to 'drivers/char/ds1286.c')
-rw-r--r-- | drivers/char/ds1286.c | 15 |
1 files changed, 8 insertions, 7 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, | |||
104 | switch (cmd) { | 104 | switch (cmd) { |
105 | case RTC_AIE_OFF: /* Mask alarm int. enab. bit */ | 105 | case RTC_AIE_OFF: /* Mask alarm int. enab. bit */ |
106 | { | 106 | { |
107 | unsigned int flags; | 107 | unsigned long flags; |
108 | unsigned char val; | 108 | unsigned char val; |
109 | 109 | ||
110 | if (!capable(CAP_SYS_TIME)) | 110 | if (!capable(CAP_SYS_TIME)) |
@@ -120,7 +120,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file, | |||
120 | } | 120 | } |
121 | case RTC_AIE_ON: /* Allow alarm interrupts. */ | 121 | case RTC_AIE_ON: /* Allow alarm interrupts. */ |
122 | { | 122 | { |
123 | unsigned int flags; | 123 | unsigned long flags; |
124 | unsigned char val; | 124 | unsigned char val; |
125 | 125 | ||
126 | if (!capable(CAP_SYS_TIME)) | 126 | if (!capable(CAP_SYS_TIME)) |
@@ -136,7 +136,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file, | |||
136 | } | 136 | } |
137 | case RTC_WIE_OFF: /* Mask watchdog int. enab. bit */ | 137 | case RTC_WIE_OFF: /* Mask watchdog int. enab. bit */ |
138 | { | 138 | { |
139 | unsigned int flags; | 139 | unsigned long flags; |
140 | unsigned char val; | 140 | unsigned char val; |
141 | 141 | ||
142 | if (!capable(CAP_SYS_TIME)) | 142 | if (!capable(CAP_SYS_TIME)) |
@@ -152,7 +152,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file, | |||
152 | } | 152 | } |
153 | case RTC_WIE_ON: /* Allow watchdog interrupts. */ | 153 | case RTC_WIE_ON: /* Allow watchdog interrupts. */ |
154 | { | 154 | { |
155 | unsigned int flags; | 155 | unsigned long flags; |
156 | unsigned char val; | 156 | unsigned char val; |
157 | 157 | ||
158 | if (!capable(CAP_SYS_TIME)) | 158 | if (!capable(CAP_SYS_TIME)) |
@@ -434,7 +434,7 @@ static inline unsigned char ds1286_is_updating(void) | |||
434 | static void ds1286_get_time(struct rtc_time *rtc_tm) | 434 | static void ds1286_get_time(struct rtc_time *rtc_tm) |
435 | { | 435 | { |
436 | unsigned char save_control; | 436 | unsigned char save_control; |
437 | unsigned int flags; | 437 | unsigned long flags; |
438 | unsigned long uip_watchdog = jiffies; | 438 | unsigned long uip_watchdog = jiffies; |
439 | 439 | ||
440 | /* | 440 | /* |
@@ -494,7 +494,8 @@ static int ds1286_set_time(struct rtc_time *rtc_tm) | |||
494 | { | 494 | { |
495 | unsigned char mon, day, hrs, min, sec, leap_yr; | 495 | unsigned char mon, day, hrs, min, sec, leap_yr; |
496 | unsigned char save_control; | 496 | unsigned char save_control; |
497 | unsigned int yrs, flags; | 497 | unsigned int yrs; |
498 | unsigned long flags; | ||
498 | 499 | ||
499 | 500 | ||
500 | yrs = rtc_tm->tm_year + 1900; | 501 | yrs = rtc_tm->tm_year + 1900; |
@@ -552,7 +553,7 @@ static int ds1286_set_time(struct rtc_time *rtc_tm) | |||
552 | static void ds1286_get_alm_time(struct rtc_time *alm_tm) | 553 | static void ds1286_get_alm_time(struct rtc_time *alm_tm) |
553 | { | 554 | { |
554 | unsigned char cmd; | 555 | unsigned char cmd; |
555 | unsigned int flags; | 556 | unsigned long flags; |
556 | 557 | ||
557 | /* | 558 | /* |
558 | * Only the values that we read from the RTC are set. That | 559 | * Only the values that we read from the RTC are set. That |