diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-15 08:42:21 +0000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-05-17 21:15:39 +0200 |
| commit | b1f3bb494e8acddeb972331c2ac642b3c7bceeb9 (patch) | |
| tree | 3f04922eb7c5301810db28dd0546293b0bf846ae /arch/m68k/mvme16x | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| download | kernel_samsung_smdk4412-b1f3bb494e8acddeb972331c2ac642b3c7bceeb9.zip kernel_samsung_smdk4412-b1f3bb494e8acddeb972331c2ac642b3c7bceeb9.tar.gz kernel_samsung_smdk4412-b1f3bb494e8acddeb972331c2ac642b3c7bceeb9.tar.bz2 | |
m68k: Remove BKL from rtc implementations
m68k does not support SMP. The access to the rtc is already serialized
with local_irq_save/restore which is sufficient on UP.
The open() protection in arch/m68k/mvme16x/rtc.c is not pretty but
sufficient on UP and safe w/o the BKL.
open() in arch/m68k/bvme6000/rtc.c can do with the same atomic logic
as arch/m68k/mvme16x/rtc.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mvme16x')
| -rw-r--r-- | arch/m68k/mvme16x/rtc.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index 8da9c25..11ac6f6 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c @@ -9,7 +9,6 @@ #include <linux/types.h> #include <linux/errno.h> #include <linux/miscdevice.h> -#include <linux/smp_lock.h> #include <linux/ioport.h> #include <linux/capability.h> #include <linux/fcntl.h> @@ -36,8 +35,7 @@ static const unsigned char days_in_mo[] = static atomic_t rtc_ready = ATOMIC_INIT(1); -static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg) +static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { volatile MK48T08ptr_t rtc = (MK48T08ptr_t)MVME_RTC_BASE; unsigned long flags; @@ -120,22 +118,15 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, } /* - * We enforce only one user at a time here with the open/close. - * Also clear the previous interrupt data on an open, and clean - * up things on a close. + * We enforce only one user at a time here with the open/close. */ - static int rtc_open(struct inode *inode, struct file *file) { - lock_kernel(); if( !atomic_dec_and_test(&rtc_ready) ) { atomic_inc( &rtc_ready ); - unlock_kernel(); return -EBUSY; } - unlock_kernel(); - return 0; } @@ -150,9 +141,9 @@ static int rtc_release(struct inode *inode, struct file *file) */ static const struct file_operations rtc_fops = { - .ioctl = rtc_ioctl, - .open = rtc_open, - .release = rtc_release, + .unlocked_ioctl = rtc_ioctl, + .open = rtc_open, + .release = rtc_release, }; static struct miscdevice rtc_dev= |