Skip to content

Commit

Permalink
mips: Remove BKL from tb0219
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner committed Oct 14, 2009
1 parent 3a8183a commit d2a7be0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/char/tb0219.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/smp_lock.h>

#include <asm/io.h>
#include <asm/reboot.h>
Expand All @@ -38,7 +37,7 @@ MODULE_PARM_DESC(major, "Major device number");

static void (*old_machine_restart)(char *command);
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_write(offset, value) writew((value), tb0219_base + (offset))
Expand Down Expand Up @@ -237,7 +236,6 @@ static int tanbac_tb0219_open(struct inode *inode, struct file *file)
{
unsigned int minor;

cycle_kernel_lock();
minor = iminor(inode);
switch (minor) {
case 0:
Expand Down Expand Up @@ -306,8 +304,6 @@ static int __devinit tb0219_probe(struct platform_device *dev)
return retval;
}

spin_lock_init(&tb0219_lock);

old_machine_restart = _machine_restart;
_machine_restart = tb0219_restart;

Expand Down

0 comments on commit d2a7be0

Please sign in to comment.