From: Oliver Neukum <oliver@neukum.org>
Date: Thu, 14 Jan 2010 15:13:46 +0000 (+0100)
Subject: USB: BKL removal: frontier
X-Git-Tag: v2.6.34-rc1~215^2~72
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9fd5c675864263e9f0e6bdb2d752bb380b32a01b;p=linux.git

USB: BKL removal: frontier

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/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index e2f82f0dbad8..15aed87fe1bb 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -41,7 +41,6 @@
 #include <linux/mutex.h>
 
 #include <linux/uaccess.h>
-#include <linux/smp_lock.h>
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
@@ -326,7 +325,6 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
 	int retval = 0;
 	struct usb_interface *interface;
 
-	lock_kernel();
 	nonseekable_open(inode, file);
 	subminor = iminor(inode);
 
@@ -396,7 +394,6 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
 
 unlock_disconnect_exit:
 	mutex_unlock(&disconnect_mutex);
-	unlock_kernel();
 
 	return retval;
 }
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index 1d3f7dc90f4f..ef8fcc8c67bd 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -40,7 +40,6 @@
 #include <linux/mutex.h>
 
 #include <linux/uaccess.h>
-#include <linux/smp_lock.h>
 #include <linux/input.h>
 #include <linux/usb.h>
 #include <linux/poll.h>
@@ -344,7 +343,6 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
 	int retval = 0;
 	struct usb_interface *interface;
 
-	lock_kernel();
 	nonseekable_open(inode, file);
 	subminor = iminor(inode);
 
@@ -415,7 +413,6 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
 
 unlock_disconnect_exit:
 	mutex_unlock(&disconnect_mutex);
-	unlock_kernel();
 
 	return retval;
 }