adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

mips: Remove BKL from tb0219

Browse source 
cycle_kernel_lock() was added during the big BKL pushdown. It should
ensure the serializiation against driver init code.

tb0219_base is initialized before the character device is
registered, but the spinlock is not initialized.

Initialize the spinlock statically and remove cycle_kernel_lock().

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <20091010153350.222654356@linutronix.de>
Cc: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Thomas Gleixner 2009-10-10 16:07:03 +02:00
parent 3a8183a206
commit d2a7be0be1
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/char/tb0219.c
View file

@ -21,7 +21,6 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/smp_lock.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/reboot.h> #include <asm/reboot.h>
@ -38,7 +37,7 @@ MODULE_PARM_DESC(major, "Major device number");
static void (*old_machine_restart)(char *command); static void (*old_machine_restart)(char *command);
static void __iomem *tb0219_base; static void __iomem *tb0219_base;
static spinlock_t tb0219_lock; static DEFINE_SPINLOCK(tb0219_lock);
#define tb0219_read(offset) readw(tb0219_base + (offset)) #define tb0219_read(offset) readw(tb0219_base + (offset))
#define tb0219_write(offset, value) writew((value), tb0219_base + (offset)) #define tb0219_write(offset, value) writew((value), tb0219_base + (offset))
@ -237,7 +236,6 @@ static int tanbac_tb0219_open(struct inode *inode, struct file *file)
{ {
unsigned int minor; unsigned int minor;
cycle_kernel_lock();
minor = iminor(inode); minor = iminor(inode);
switch (minor) { switch (minor) {
case 0: case 0:
@ -306,8 +304,6 @@ static int __devinit tb0219_probe(struct platform_device *dev)
return retval; return retval;
} }
spin_lock_init(&tb0219_lock);
old_machine_restart = _machine_restart; old_machine_restart = _machine_restart;
_machine_restart = tb0219_restart; _machine_restart = tb0219_restart;