8 files changed, 13 insertions, 72 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index b3d5a23ab56f..869d47cb6db3 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1358,6 +1358,9 @@ static struct usb_device_id acm_ids[] = {
         { USB_DEVICE(0x079b, 0x000f), /* BT On-Air USB MODEM */
         .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
         },
+        { USB_DEVICE(0x0ace, 0x1602), /* ZyDAS 56K USB MODEM */
+        .driver_info = SINGLE_RX_URB,
+        },
         { USB_DEVICE(0x0ace, 0x1608), /* ZyDAS 56K USB MODEM */
         .driver_info = SINGLE_RX_URB, /* firmware bug */
         },
@@ -1493,4 +1496,4 @@ module_exit(acm_exit);
 MODULE_AUTHOR( DRIVER_AUTHOR );
 MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_LICENSE("GPL");
-
+MODULE_ALIAS_CHARDEV_MAJOR(ACM_TTY_MAJOR);
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index f2618d17710d..c637207a1c80 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -622,7 +622,7 @@ static int ehci_run (struct usb_hcd *hcd)
                 ehci_writel(ehci, 0, &ehci->regs->segment);
 #if 0
 // this is deeply broken on almost all architectures
-                if (!dma_set_mask(hcd->self.controller, DMA_64BIT_MASK))
+                if (!dma_set_mask(hcd->self.controller, DMA_BIT_MASK(64)))
                         ehci_info(ehci, "enabled 64bit DMA\n");
 #endif
         }
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index abb9a7706ec7..5aa8bce90e1f 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -108,7 +108,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                 case 0x00d8:    /* CK8 */
                 case 0x00e8:    /* CK8S */
                         if (pci_set_consistent_dma_mask(pdev,
-                                                DMA_31BIT_MASK) < 0)
+                                                DMA_BIT_MASK(31)) < 0)
                                 ehci_warn(ehci, "can't enable NVidia "
                                         "workaround for >2GB RAM\n");
                         break;
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 9c9da35abc6c..1ba9f9a8c308 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -81,7 +81,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev)
         int result;
         struct usb_hcd *hcd;
         unsigned int virq;
-        static u64 dummy_mask = DMA_32BIT_MASK;
+        static u64 dummy_mask = DMA_BIT_MASK(32);
 
         if (usb_disabled()) {
                 result = -ENODEV;
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 3c1a3b5f89f1..3d1910317328 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -80,7 +80,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev)
         int result;
         struct usb_hcd *hcd;
         unsigned int virq;
-        static u64 dummy_mask = DMA_32BIT_MASK;
+        static u64 dummy_mask = DMA_BIT_MASK(32);
 
         if (usb_disabled()) {
                 result = -ENODEV;
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 1aed584be5eb..751a533a4347 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -79,6 +79,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) },
         { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_EF81) },
+        { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_ID_S81) }, /* Benq/Siemens S81 */
         { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) },
         { USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID) },
         { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 54974f446a8c..1d7a22e3a9fd 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -7,6 +7,10 @@
  *      (at your option) any later version.
  * 
  */
+
+#define BENQ_VENDOR_ID                  0x04a5
+#define BENQ_PRODUCT_ID_S81             0x4027
+
 #define PL2303_VENDOR_ID        0x067b
 #define PL2303_PRODUCT_ID       0x2303
 #define PL2303_PRODUCT_ID_RSAQ2         0x04bb
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 8b3cbc87adc7..69879e437940 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -139,14 +139,6 @@ static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port,
         priv->port = port;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        /*
-         * Force low_latency on so that our tty_push actually forces the data
-         * through, otherwise it is scheduled, and with high data rates (like
-         * with OHCI) data can get lost.
-         */
-        if (tty)
-                tty->low_latency = 1;
-
         /* Start reading from the device */
         usb_fill_int_urb(priv->int_urb, priv->udev,
                          usb_rcvintpipe(priv->udev, priv->int_address),
@@ -205,62 +197,6 @@ static void symbol_unthrottle(struct tty_struct *tty)
                                                         __func__, result);
 }
 
-static int symbol_ioctl(struct tty_struct *tty, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct device *dev = &port->dev;
-
-        /*
-         * Right now we need to figure out what commands
-         * most userspace tools want to see for this driver,
-         * so just log the things.
-         */
-        switch (cmd) {
-        case TIOCSERGETLSR:
-                dev_info(dev, "%s: TIOCSERGETLSR\n", __func__);
-                break;
-
-        case TIOCGSERIAL:
-                dev_info(dev, "%s: TIOCGSERIAL\n", __func__);
-                break;
-
-        case TIOCMIWAIT:
-                dev_info(dev, "%s: TIOCMIWAIT\n", __func__);
-                break;
-
-        case TIOCGICOUNT:
-                dev_info(dev, "%s: TIOCGICOUNT\n", __func__);
-                break;
-        default:
-                dev_info(dev, "%s: unknown (%d)\n", __func__, cmd);
-        }
-        return -ENOIOCTLCMD;
-}
-
-static int symbol_tiocmget(struct tty_struct *tty, struct file *file)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct device *dev = &port->dev;
-
-        /* TODO */
-        /* probably just need to shadow whatever was sent to us here */
-        dev_info(dev, "%s\n", __func__);
-        return 0;
-}
-
-static int symbol_tiocmset(struct tty_struct *tty, struct file *file,
-                           unsigned int set, unsigned int clear)
-{
-        struct usb_serial_port *port = tty->driver_data;
-        struct device *dev = &port->dev;
-
-        /* TODO */
-        /* probably just need to shadow whatever was sent to us here */
-        dev_info(dev, "%s\n", __func__);
-        return 0;
-}
-
 static int symbol_startup(struct usb_serial *serial)
 {
         struct symbol_private *priv;
@@ -367,9 +303,6 @@ static struct usb_serial_driver symbol_device = {
         .shutdown =             symbol_shutdown,
         .throttle =             symbol_throttle,
         .unthrottle =           symbol_unthrottle,
-        .ioctl =                symbol_ioctl,
-        .tiocmget =             symbol_tiocmget,
-        .tiocmset =             symbol_tiocmset,
 };
 
 static int __init symbol_init(void)