From: Oliver Neukum <oliver@neukum.org>
Date: Thu, 14 Jan 2010 15:12:01 +0000 (+0100)
Subject: USB: BKL removal: ftdi-elan
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=92846fbb861f64b9db21f06d6878ca02c67554dc;p=deliverable%2Flinux.git

USB: BKL removal: ftdi-elan

BKL was not needed at all. Removed without replacement.

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 32c47fbee288..1edb6d361896 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -45,7 +45,6 @@
 #include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/mutex.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
 #include <linux/workqueue.h>
@@ -627,27 +626,22 @@ static int ftdi_elan_open(struct inode *inode, struct file *file)
 	int subminor;
 	struct usb_interface *interface;
 
-	lock_kernel();
         subminor = iminor(inode);
         interface = usb_find_interface(&ftdi_elan_driver, subminor);
 
         if (!interface) {
-		unlock_kernel();
                 printk(KERN_ERR "can't find device for minor %d\n", subminor);
                 return -ENODEV;
         } else {
                 struct usb_ftdi *ftdi = usb_get_intfdata(interface);
                 if (!ftdi) {
-			unlock_kernel();
                         return -ENODEV;
                 } else {
                         if (down_interruptible(&ftdi->sw_lock)) {
-				unlock_kernel();
                                 return -EINTR;
                         } else {
                                 ftdi_elan_get_kref(ftdi);
                                 file->private_data = ftdi;
-				unlock_kernel();
                                 return 0;
                         }
                 }