4 files changed, 24 insertions, 35 deletions

diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 316aac8e4ca1..bb8b73682a70 100644
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -2,11 +2,10 @@
 # USB Class driver configuration
 #
 comment "USB Device Class drivers"
-        depends on USB
 
 config USB_ACM
         tristate "USB Modem (CDC ACM) support"
-        depends on USB && TTY
+        depends on TTY
         ---help---
           This driver supports USB modems and ISDN adapters which support the
           Communication Device Class Abstract Control Model interface.
@@ -21,7 +20,6 @@ config USB_ACM
 
 config USB_PRINTER
         tristate "USB Printer support"
-        depends on USB
         help
           Say Y here if you want to connect a USB printer to your computer's
           USB port.
@@ -31,7 +29,6 @@ config USB_PRINTER
 
 config USB_WDM
         tristate "USB Wireless Device Management support"
-        depends on USB
         ---help---
           This driver supports the WMC Device Management functionality
           of cell phones compliant to the CDC WMC specification. You can use
@@ -42,7 +39,6 @@ config USB_WDM
 
 config USB_TMC
         tristate "USB Test and Measurement Class support"
-        depends on USB
         help
           Say Y here if you want to connect a USB device that follows
           the USB.org specification for USB Test and Measurement devices
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index c77f7ae48f1c..171d7a9df3ae 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -828,14 +828,6 @@ static int acm_tty_ioctl(struct tty_struct *tty,
         return rv;
 }
 
-static const __u32 acm_tty_speed[] = {
-        0, 50, 75, 110, 134, 150, 200, 300, 600,
-        1200, 1800, 2400, 4800, 9600, 19200, 38400,
-        57600, 115200, 230400, 460800, 500000, 576000,
-        921600, 1000000, 1152000, 1500000, 2000000,
-        2500000, 3000000, 3500000, 4000000
-};
-
 static void acm_tty_set_termios(struct tty_struct *tty,
                                                 struct ktermios *termios_old)
 {
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 122d056d96d5..8a230f0ef77c 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -13,6 +13,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/ioctl.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
@@ -644,6 +645,22 @@ static int wdm_release(struct inode *inode, struct file *file)
         return 0;
 }
 
+static long wdm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct wdm_device *desc = file->private_data;
+        int rv = 0;
+
+        switch (cmd) {
+        case IOCTL_WDM_MAX_COMMAND:
+                if (copy_to_user((void __user *)arg, &desc->wMaxCommand, sizeof(desc->wMaxCommand)))
+                        rv = -EFAULT;
+                break;
+        default:
+                rv = -ENOTTY;
+        }
+        return rv;
+}
+
 static const struct file_operations wdm_fops = {
         .owner =        THIS_MODULE,
         .read =         wdm_read,
@@ -652,6 +669,8 @@ static const struct file_operations wdm_fops = {
         .flush =        wdm_flush,
         .release =      wdm_release,
         .poll =         wdm_poll,
+        .unlocked_ioctl = wdm_ioctl,
+        .compat_ioctl = wdm_ioctl,
         .llseek =       noop_llseek,
 };
 
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 70d69d06054f..4c5506ae5e45 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -718,50 +718,32 @@ exit:
 
 static int usbtmc_ioctl_clear_out_halt(struct usbtmc_device_data *data)
 {
-        u8 *buffer;
         int rv;
 
-        buffer = kmalloc(2, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
         rv = usb_clear_halt(data->usb_dev,
                             usb_sndbulkpipe(data->usb_dev, data->bulk_out));
 
         if (rv < 0) {
                 dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",
                         rv);
-                goto exit;
+                return rv;
         }
-        rv = 0;
-
-exit:
-        kfree(buffer);
-        return rv;
+        return 0;
 }
 
 static int usbtmc_ioctl_clear_in_halt(struct usbtmc_device_data *data)
 {
-        u8 *buffer;
         int rv;
 
-        buffer = kmalloc(2, GFP_KERNEL);
-        if (!buffer)
-                return -ENOMEM;
-
         rv = usb_clear_halt(data->usb_dev,
                             usb_rcvbulkpipe(data->usb_dev, data->bulk_in));
 
         if (rv < 0) {
                 dev_err(&data->usb_dev->dev, "usb_control_msg returned %d\n",
                         rv);
-                goto exit;
+                return rv;
         }
-        rv = 0;
-
-exit:
-        kfree(buffer);
-        return rv;
+        return 0;
 }
 
 static int get_capabilities(struct usbtmc_device_data *data)