diff options
| -rw-r--r-- | drivers/char/tb0219.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c index b3ec9b10e292..cad4eb65f13d 100644 --- a/drivers/char/tb0219.c +++ b/drivers/char/tb0219.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/smp_lock.h> | ||
| 25 | 24 | ||
| 26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 27 | #include <asm/reboot.h> | 26 | #include <asm/reboot.h> |
| @@ -38,7 +37,7 @@ MODULE_PARM_DESC(major, "Major device number"); | |||
| 38 | 37 | ||
| 39 | static void (*old_machine_restart)(char *command); | 38 | static void (*old_machine_restart)(char *command); |
| 40 | static void __iomem *tb0219_base; | 39 | static void __iomem *tb0219_base; |
| 41 | static spinlock_t tb0219_lock; | 40 | static DEFINE_SPINLOCK(tb0219_lock); |
| 42 | 41 | ||
| 43 | #define tb0219_read(offset) readw(tb0219_base + (offset)) | 42 | #define tb0219_read(offset) readw(tb0219_base + (offset)) |
| 44 | #define tb0219_write(offset, value) writew((value), tb0219_base + (offset)) | 43 | #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) | |||
| 237 | { | 236 | { |
| 238 | unsigned int minor; | 237 | unsigned int minor; |
| 239 | 238 | ||
| 240 | cycle_kernel_lock(); | ||
| 241 | minor = iminor(inode); | 239 | minor = iminor(inode); |
| 242 | switch (minor) { | 240 | switch (minor) { |
| 243 | case 0: | 241 | case 0: |
| @@ -306,8 +304,6 @@ static int __devinit tb0219_probe(struct platform_device *dev) | |||
| 306 | return retval; | 304 | return retval; |
| 307 | } | 305 | } |
| 308 | 306 | ||
| 309 | spin_lock_init(&tb0219_lock); | ||
| 310 | |||
| 311 | old_machine_restart = _machine_restart; | 307 | old_machine_restart = _machine_restart; |
| 312 | _machine_restart = tb0219_restart; | 308 | _machine_restart = tb0219_restart; |
| 313 | 309 | ||
