From: Arnd Bergmann <[email protected]>

There is nothing that the BKL can possibly
protect here, so just remove it.

Cc: Ross Cohen <[email protected]>

Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/go7007/Kconfig        |    1 -
 drivers/staging/go7007/s2250-loader.c |    3 ---
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig
index 1da57df..7dfb281 100644
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@ -1,7 +1,6 @@
 config VIDEO_GO7007
        tristate "WIS GO7007 MPEG encoder support"
        depends on VIDEO_DEV && PCI && I2C
-       depends on BKL # please fix
        depends on SND
        select VIDEOBUF_DMA_SG
        depends on RC_CORE
diff --git a/drivers/staging/go7007/s2250-loader.c 
b/drivers/staging/go7007/s2250-loader.c
index 7547a8f..4e13251 100644
--- a/drivers/staging/go7007/s2250-loader.c
+++ b/drivers/staging/go7007/s2250-loader.c
@@ -18,7 +18,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <dvb-usb.h>
 
@@ -142,11 +141,9 @@ static void s2250loader_disconnect(struct usb_interface 
*interface)
 {
        pdevice_extension_t s;
        printk(KERN_INFO "s2250: disconnect\n");
-       lock_kernel();
        s = usb_get_intfdata(interface);
        usb_set_intfdata(interface, NULL);
        kref_put(&(s->kref), s2250loader_delete);
-       unlock_kernel();
 }
 
 static const struct usb_device_id s2250loader_ids[] = {
-- 
1.7.4.1

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to