include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / drivers / usb / class / usbtmc.c

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 426bfc72b9b4a0bbb8292c5f5be2356ffc90dcb4..3e7c1b800ebb03e8668ac6a506cc137d26bcf41a 100644 (file)
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -25,8 +25,8 @@
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 #include <linux/kref.h>
+#include <linux/slab.h>
 #include <linux/mutex.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/usb/tmc.h>
 
@@ -114,7 +114,6 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
        struct usbtmc_device_data *data;
        int retval = 0;
 
-       lock_kernel();
        intf = usb_find_interface(&usbtmc_driver, iminor(inode));
        if (!intf) {
                printk(KERN_ERR KBUILD_MODNAME
@@ -130,7 +129,6 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
        filp->private_data = data;
 
 exit:
-       unlock_kernel();
        return retval;
 }