sony-laptop: Kill the BKL

Commit Message

Alessio Igor Bogani March 20, 2009, 6:08 p.m. UTC

---------- Forwarded message ----------
From: Alessio Igor Bogani <[e-mail]>
Date: 2009/3/20
Subject: [PATCH] sony-laptop: Kill the BKL
To: LKML <[e-mail]>
Cc: Alessio Igor Bogani <[e-mail]>


Signed-off-by: Alessio Igor Bogani <[e-mail]>
---
 drivers/platform/x86/sony-laptop.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/platform/x86/sony-laptop.c
b/drivers/platform/x86/sony-laptop.c
index 537959d..15f940b 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -46,7 +46,6 @@ 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
@@ -1934,10 +1933,15 @@  static int sonypi_misc_release(struct inode
*inode, struct file *file)
 static int sonypi_misc_open(struct inode *inode, struct file *file)
 {
       /* Flush input queue on first open */
-       lock_kernel();
+       unsigned long flags;
+
+       spin_lock_irqsave(sonypi_compat.fifo->lock, flags);
+
       if (atomic_inc_return(&sonypi_compat.open_count) == 1)
-               kfifo_reset(sonypi_compat.fifo);
-       unlock_kernel();
+               __kfifo_reset(sonypi_compat.fifo);
+
+       spin_unlock_irqrestore(sonypi_compat.fifo->lock, flags);
+
       return 0;
 }