staging/go7007: remove the BKL
authorArnd Bergmann <arnd@arndb.de>
Tue, 25 Jan 2011 22:17:19 +0000 (23:17 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 31 Jan 2011 21:38:15 +0000 (13:38 -0800)
There is nothing that the BKL can possibly
protect here, so just remove it.

Cc: Ross Cohen <rcohen@snurgle.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/go7007/Kconfig
drivers/staging/go7007/s2250-loader.c

index 1da57df5cbcbc08beba2b4134e37a44c854b627d..7dfb2815b9ec730a69179d89b9874c87a31656eb 100644 (file)
@@ -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
index 7547a8f77345a00fc3c261ed0624eb3a31b95306..4e132519e253c428750c86a16ae80a166213d757 100644 (file)
@@ -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[] = {