Commit 031ac91d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] MVME16x core local_irq*() updates

Convert core MVME16x code to new local_irq*() framework
parent a50b9779
...@@ -48,8 +48,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -48,8 +48,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
switch (cmd) { switch (cmd) {
case RTC_RD_TIME: /* Read the time/date from RTC */ case RTC_RD_TIME: /* Read the time/date from RTC */
{ {
save_flags(flags); local_irq_save(flags);
cli();
/* Ensure clock and real-time-mode-register are accessible */ /* Ensure clock and real-time-mode-register are accessible */
rtc->ctrl = RTC_READ; rtc->ctrl = RTC_READ;
wtime.tm_sec = BCD2BIN(rtc->bcd_sec); wtime.tm_sec = BCD2BIN(rtc->bcd_sec);
...@@ -62,7 +61,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -62,7 +61,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
wtime.tm_year += 100; wtime.tm_year += 100;
wtime.tm_wday = BCD2BIN(rtc->bcd_dow)-1; wtime.tm_wday = BCD2BIN(rtc->bcd_dow)-1;
rtc->ctrl = 0; rtc->ctrl = 0;
restore_flags(flags); local_irq_restore(flags);
return copy_to_user((void *)arg, &wtime, sizeof wtime) ? return copy_to_user((void *)arg, &wtime, sizeof wtime) ?
-EFAULT : 0; -EFAULT : 0;
} }
...@@ -102,8 +101,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -102,8 +101,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
if (yrs >= 2070) if (yrs >= 2070)
return -EINVAL; return -EINVAL;
save_flags(flags); local_irq_save(flags);
cli();
rtc->ctrl = RTC_WRITE; rtc->ctrl = RTC_WRITE;
rtc->bcd_sec = BIN2BCD(sec); rtc->bcd_sec = BIN2BCD(sec);
...@@ -114,7 +112,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -114,7 +112,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
rtc->bcd_year = BIN2BCD(yrs%100); rtc->bcd_year = BIN2BCD(yrs%100);
rtc->ctrl = 0; rtc->ctrl = 0;
restore_flags(flags); local_irq_restore(flags);
return 0; return 0;
} }
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment