Merge commit 'v2.6.30-rc1' into core/urgent

Merge reason: need latest upstream to queue up dependent fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

16 files changed, 107 insertions, 245 deletions

diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index b6483dd98acc..9cf9ff69e3e3 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -626,7 +626,7 @@ static void uea_upload_pre_firmware(const struct firmware *fw_entry, void *conte
                 goto err_fw_corrupted;
 
         /*
-         * Start to upload formware : send reset
+         * Start to upload firmware : send reset
          */
         value = 1;
         ret = uea_send_modem_cmd(usb, F8051_USBCS, sizeof(value), &value);
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/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 770b3eaa9184..080bb1e4b847 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -392,7 +392,7 @@ config USB_GADGET_FSL_QE
            controllers having QE or CPM2, given minor tweaks.
 
            Set CONFIG_USB_GADGET to "m" to build this driver as a
-           dynmically linked module called "fsl_qe_udc".
+           dynamically linked module called "fsl_qe_udc".
 
 config USB_FSL_QE
         tristate
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index c22fab164113..563d57275448 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -319,7 +319,7 @@ static inline void usba_cleanup_debugfs(struct usba_udc *udc)
 
 static int vbus_is_present(struct usba_udc *udc)
 {
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 return gpio_get_value(udc->vbus_pin);
 
         /* No Vbus detection: Assume always present */
@@ -1821,7 +1821,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
         DBG(DBG_GADGET, "registered driver `%s'\n", driver->driver.name);
 
         udc->vbus_prev = 0;
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 enable_irq(gpio_to_irq(udc->vbus_pin));
 
         /* If Vbus is present, enable the controller and wait for reset */
@@ -1852,7 +1852,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
         if (driver != udc->driver || !driver->unbind)
                 return -EINVAL;
 
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 disable_irq(gpio_to_irq(udc->vbus_pin));
 
         spin_lock_irqsave(&udc->lock, flags);
@@ -1910,7 +1910,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
         udc->pdev = pdev;
         udc->pclk = pclk;
         udc->hclk = hclk;
-        udc->vbus_pin = -1;
+        udc->vbus_pin = -ENODEV;
 
         ret = -ENOMEM;
         udc->regs = ioremap(regs->start, regs->end - regs->start + 1);
@@ -1996,7 +1996,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
                 goto err_device_add;
         }
 
-        if (pdata->vbus_pin >= 0) {
+        if (gpio_is_valid(pdata->vbus_pin)) {
                 if (!gpio_request(pdata->vbus_pin, "atmel_usba_udc")) {
                         udc->vbus_pin = pdata->vbus_pin;
 
@@ -2005,7 +2005,7 @@ static int __init usba_udc_probe(struct platform_device *pdev)
                                         "atmel_usba_udc", udc);
                         if (ret) {
                                 gpio_free(udc->vbus_pin);
-                                udc->vbus_pin = -1;
+                                udc->vbus_pin = -ENODEV;
                                 dev_warn(&udc->pdev->dev,
                                          "failed to request vbus irq; "
                                          "assuming always on\n");
@@ -2051,7 +2051,7 @@ static int __exit usba_udc_remove(struct platform_device *pdev)
                 usba_ep_cleanup_debugfs(&usba_ep[i]);
         usba_cleanup_debugfs(udc);
 
-        if (udc->vbus_pin != -1)
+        if (gpio_is_valid(udc->vbus_pin))
                 gpio_free(udc->vbus_pin);
 
         free_irq(udc->irq, udc);
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/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index c1b279939bbf..f13fd488ebec 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -715,7 +715,7 @@ io_edgeport.c Change Log comments:
 
  0.2 (01/30/2000) greg kroah-hartman
         Milestone 1 release.
-        Device is found by USB subsystem, enumerated, fimware is downloaded
+        Device is found by USB subsystem, enumerated, firmware is downloaded
         and the descriptors are printed to the debug log, config is set, and
         green light starts to blink. Open port works, and data can be sent
         and received at the default settings of the UART. Loopback connector
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index a65f9196b0a0..c480ea4c19f2 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -518,8 +518,8 @@ config USB_SERIAL_SIERRAWIRELESS
         help
           Say M here if you want to use Sierra Wireless devices.
 
-          Many deviecs have a feature known as TRU-Install, for those devices
-          to work properly the USB Storage Sierra feature must be enabled.
+          Many devices have a feature known as TRU-Install. For those devices
+          to work properly, the USB Storage Sierra feature must be enabled.
 
           To compile this driver as a module, choose M here: the
           module will be called sierra.
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)
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 882c57b399f7..fdba2f69d4c9 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -46,6 +46,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/ata.h>
 #include <linux/hdreg.h>
 #include <linux/scatterlist.h>
 
@@ -328,7 +329,7 @@ struct isd200_config {
 
 struct isd200_info {
         struct inquiry_data InquiryData;
-        struct hd_driveid *id;
+        u16 *id;
         struct isd200_config ConfigData;
         unsigned char *RegsBuf;
         unsigned char ATARegs[8];
@@ -419,19 +420,19 @@ static void isd200_build_sense(struct us_data *us, struct scsi_cmnd *srb)
                 buf->Flags = UNIT_ATTENTION;
                 buf->AdditionalSenseCode = 0;
                 buf->AdditionalSenseCodeQualifier = 0;
-        } else if(error & MCR_ERR) {
+        } else if (error & ATA_MCR) {
                 buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
                 buf->AdditionalSenseLength = 0xb;
                 buf->Flags =  UNIT_ATTENTION;
                 buf->AdditionalSenseCode = 0;
                 buf->AdditionalSenseCodeQualifier = 0;
-        } else if(error & TRK0_ERR) {
+        } else if (error & ATA_TRK0NF) {
                 buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
                 buf->AdditionalSenseLength = 0xb;
                 buf->Flags =  NOT_READY;
                 buf->AdditionalSenseCode = 0;
                 buf->AdditionalSenseCodeQualifier = 0;
-        } else if(error & ECC_ERR) {
+        } else if (error & ATA_UNC) {
                 buf->ErrorCode = 0x70 | SENSE_ERRCODE_VALID;
                 buf->AdditionalSenseLength = 0xb;
                 buf->Flags =  DATA_PROTECT;
@@ -547,16 +548,16 @@ static int isd200_action( struct us_data *us, int action,
                 ata.generic.ActionSelect = ACTION_SELECT_1|ACTION_SELECT_5;
                 ata.generic.RegisterSelect = REG_DEVICE_HEAD | REG_COMMAND;
                 ata.write.DeviceHeadByte = info->DeviceHead;
-                ata.write.CommandByte = WIN_SRST;
+                ata.write.CommandByte = ATA_CMD_DEV_RESET;
                 isd200_set_srb(info, DMA_NONE, NULL, 0);
                 break;
 
         case ACTION_IDENTIFY:
                 US_DEBUGP("   isd200_action(IDENTIFY)\n");
                 ata.generic.RegisterSelect = REG_COMMAND;
-                ata.write.CommandByte = WIN_IDENTIFY;
+                ata.write.CommandByte = ATA_CMD_ID_ATA;
                 isd200_set_srb(info, DMA_FROM_DEVICE, info->id,
-                                                sizeof(struct hd_driveid));
+                                ATA_ID_WORDS * 2);
                 break;
 
         default:
@@ -944,22 +945,22 @@ static int isd200_try_enum(struct us_data *us, unsigned char master_slave,
                         break;
 
                 if (!detect) {
-                        if (regs[ATA_REG_STATUS_OFFSET] & BUSY_STAT) {
+                        if (regs[ATA_REG_STATUS_OFFSET] & ATA_BUSY) {
                                 US_DEBUGP("   %s status is still BSY, try again...\n",mstr);
                         } else {
                                 US_DEBUGP("   %s status !BSY, continue with next operation\n",mstr);
                                 break;
                         }
                 }
-                /* check for BUSY_STAT and */
-                /* WRERR_STAT (workaround ATA Zip drive) and */ 
-                /* ERR_STAT (workaround for Archos CD-ROM) */
+                /* check for ATA_BUSY and */
+                /* ATA_DF (workaround ATA Zip drive) and */
+                /* ATA_ERR (workaround for Archos CD-ROM) */
                 else if (regs[ATA_REG_STATUS_OFFSET] &
-                         (BUSY_STAT | WRERR_STAT | ERR_STAT )) {
+                         (ATA_BUSY | ATA_DF | ATA_ERR)) {
                         US_DEBUGP("   Status indicates it is not ready, try again...\n");
                 }
                 /* check for DRDY, ATA devices set DRDY after SRST */
-                else if (regs[ATA_REG_STATUS_OFFSET] & READY_STAT) {
+                else if (regs[ATA_REG_STATUS_OFFSET] & ATA_DRDY) {
                         US_DEBUGP("   Identified ATA device\n");
                         info->DeviceFlags |= DF_ATA_DEVICE;
                         info->DeviceHead = master_slave;
@@ -1053,103 +1054,50 @@ static int isd200_manual_enum(struct us_data *us)
         return(retStatus);
 }
 
-static void isd200_fix_driveid (struct hd_driveid *id)
+static void isd200_fix_driveid(u16 *id)
 {
 #ifndef __LITTLE_ENDIAN
 # ifdef __BIG_ENDIAN
         int i;
-        u16 *stringcast;
-
-        id->config         = __le16_to_cpu(id->config);
-        id->cyls           = __le16_to_cpu(id->cyls);
-        id->reserved2      = __le16_to_cpu(id->reserved2);
-        id->heads          = __le16_to_cpu(id->heads);
-        id->track_bytes    = __le16_to_cpu(id->track_bytes);
-        id->sector_bytes   = __le16_to_cpu(id->sector_bytes);
-        id->sectors        = __le16_to_cpu(id->sectors);
-        id->vendor0        = __le16_to_cpu(id->vendor0);
-        id->vendor1        = __le16_to_cpu(id->vendor1);
-        id->vendor2        = __le16_to_cpu(id->vendor2);
-        stringcast = (u16 *)&id->serial_no[0];
-        for (i = 0; i < (20/2); i++)
-                stringcast[i] = __le16_to_cpu(stringcast[i]);
-        id->buf_type       = __le16_to_cpu(id->buf_type);
-        id->buf_size       = __le16_to_cpu(id->buf_size);
-        id->ecc_bytes      = __le16_to_cpu(id->ecc_bytes);
-        stringcast = (u16 *)&id->fw_rev[0];
-        for (i = 0; i < (8/2); i++)
-                stringcast[i] = __le16_to_cpu(stringcast[i]);
-        stringcast = (u16 *)&id->model[0];
-        for (i = 0; i < (40/2); i++)
-                stringcast[i] = __le16_to_cpu(stringcast[i]);
-        id->dword_io       = __le16_to_cpu(id->dword_io);
-        id->reserved50     = __le16_to_cpu(id->reserved50);
-        id->field_valid    = __le16_to_cpu(id->field_valid);
-        id->cur_cyls       = __le16_to_cpu(id->cur_cyls);
-        id->cur_heads      = __le16_to_cpu(id->cur_heads);
-        id->cur_sectors    = __le16_to_cpu(id->cur_sectors);
-        id->cur_capacity0  = __le16_to_cpu(id->cur_capacity0);
-        id->cur_capacity1  = __le16_to_cpu(id->cur_capacity1);
-        id->lba_capacity   = __le32_to_cpu(id->lba_capacity);
-        id->dma_1word      = __le16_to_cpu(id->dma_1word);
-        id->dma_mword      = __le16_to_cpu(id->dma_mword);
-        id->eide_pio_modes = __le16_to_cpu(id->eide_pio_modes);
-        id->eide_dma_min   = __le16_to_cpu(id->eide_dma_min);
-        id->eide_dma_time  = __le16_to_cpu(id->eide_dma_time);
-        id->eide_pio       = __le16_to_cpu(id->eide_pio);
-        id->eide_pio_iordy = __le16_to_cpu(id->eide_pio_iordy);
-        for (i = 0; i < 2; ++i)
-                id->words69_70[i] = __le16_to_cpu(id->words69_70[i]);
-        for (i = 0; i < 4; ++i)
-                id->words71_74[i] = __le16_to_cpu(id->words71_74[i]);
-        id->queue_depth    = __le16_to_cpu(id->queue_depth);
-        for (i = 0; i < 4; ++i)
-                id->words76_79[i] = __le16_to_cpu(id->words76_79[i]);
-        id->major_rev_num  = __le16_to_cpu(id->major_rev_num);
-        id->minor_rev_num  = __le16_to_cpu(id->minor_rev_num);
-        id->command_set_1  = __le16_to_cpu(id->command_set_1);
-        id->command_set_2  = __le16_to_cpu(id->command_set_2);
-        id->cfsse          = __le16_to_cpu(id->cfsse);
-        id->cfs_enable_1   = __le16_to_cpu(id->cfs_enable_1);
-        id->cfs_enable_2   = __le16_to_cpu(id->cfs_enable_2);
-        id->csf_default    = __le16_to_cpu(id->csf_default);
-        id->dma_ultra      = __le16_to_cpu(id->dma_ultra);
-        id->trseuc         = __le16_to_cpu(id->trseuc);
-        id->trsEuc         = __le16_to_cpu(id->trsEuc);
-        id->CurAPMvalues   = __le16_to_cpu(id->CurAPMvalues);
-        id->mprc           = __le16_to_cpu(id->mprc);
-        id->hw_config      = __le16_to_cpu(id->hw_config);
-        id->acoustic       = __le16_to_cpu(id->acoustic);
-        id->msrqs          = __le16_to_cpu(id->msrqs);
-        id->sxfert         = __le16_to_cpu(id->sxfert);
-        id->sal            = __le16_to_cpu(id->sal);
-        id->spg            = __le32_to_cpu(id->spg);
-        id->lba_capacity_2 = __le64_to_cpu(id->lba_capacity_2);
-        for (i = 0; i < 22; i++)
-                id->words104_125[i]   = __le16_to_cpu(id->words104_125[i]);
-        id->last_lun       = __le16_to_cpu(id->last_lun);
-        id->word127        = __le16_to_cpu(id->word127);
-        id->dlf            = __le16_to_cpu(id->dlf);
-        id->csfo           = __le16_to_cpu(id->csfo);
-        for (i = 0; i < 26; i++)
-                id->words130_155[i] = __le16_to_cpu(id->words130_155[i]);
-        id->word156        = __le16_to_cpu(id->word156);
-        for (i = 0; i < 3; i++)
-                id->words157_159[i] = __le16_to_cpu(id->words157_159[i]);
-        id->cfa_power      = __le16_to_cpu(id->cfa_power);
-        for (i = 0; i < 14; i++)
-                id->words161_175[i] = __le16_to_cpu(id->words161_175[i]);
-        for (i = 0; i < 31; i++)
-                id->words176_205[i] = __le16_to_cpu(id->words176_205[i]);
-        for (i = 0; i < 48; i++)
-                id->words206_254[i] = __le16_to_cpu(id->words206_254[i]);
-        id->integrity_word  = __le16_to_cpu(id->integrity_word);
+
+        for (i = 0; i < ATA_ID_WORDS; i++)
+                id[i] = __le16_to_cpu(id[i]);
 # else
 #  error "Please fix <asm/byteorder.h>"
 # endif
 #endif
 }
 
+static void isd200_dump_driveid(u16 *id)
+{
+        US_DEBUGP("   Identify Data Structure:\n");
+        US_DEBUGP("      config = 0x%x\n",        id[ATA_ID_CONFIG]);
+        US_DEBUGP("      cyls = 0x%x\n",          id[ATA_ID_CYLS]);
+        US_DEBUGP("      heads = 0x%x\n",         id[ATA_ID_HEADS]);
+        US_DEBUGP("      track_bytes = 0x%x\n",   id[4]);
+        US_DEBUGP("      sector_bytes = 0x%x\n",  id[5]);
+        US_DEBUGP("      sectors = 0x%x\n",       id[ATA_ID_SECTORS]);
+        US_DEBUGP("      serial_no[0] = 0x%x\n",  *(char *)&id[ATA_ID_SERNO]);
+        US_DEBUGP("      buf_type = 0x%x\n",      id[20]);
+        US_DEBUGP("      buf_size = 0x%x\n",      id[ATA_ID_BUF_SIZE]);
+        US_DEBUGP("      ecc_bytes = 0x%x\n",     id[22]);
+        US_DEBUGP("      fw_rev[0] = 0x%x\n",     *(char *)&id[ATA_ID_FW_REV]);
+        US_DEBUGP("      model[0] = 0x%x\n",      *(char *)&id[ATA_ID_PROD]);
+        US_DEBUGP("      max_multsect = 0x%x\n",  id[ATA_ID_MAX_MULTSECT] & 0xff);
+        US_DEBUGP("      dword_io = 0x%x\n",      id[ATA_ID_DWORD_IO]);
+        US_DEBUGP("      capability = 0x%x\n",    id[ATA_ID_CAPABILITY] >> 8);
+        US_DEBUGP("      tPIO = 0x%x\n",          id[ATA_ID_OLD_PIO_MODES] >> 8);
+        US_DEBUGP("      tDMA = 0x%x\n",          id[ATA_ID_OLD_DMA_MODES] >> 8);
+        US_DEBUGP("      field_valid = 0x%x\n",   id[ATA_ID_FIELD_VALID]);
+        US_DEBUGP("      cur_cyls = 0x%x\n",      id[ATA_ID_CUR_CYLS]);
+        US_DEBUGP("      cur_heads = 0x%x\n",     id[ATA_ID_CUR_HEADS]);
+        US_DEBUGP("      cur_sectors = 0x%x\n",   id[ATA_ID_CUR_SECTORS]);
+        US_DEBUGP("      cur_capacity = 0x%x\n",  ata_id_u32(id, 57));
+        US_DEBUGP("      multsect = 0x%x\n",      id[ATA_ID_MULTSECT] & 0xff);
+        US_DEBUGP("      lba_capacity = 0x%x\n",  ata_id_u32(id, ATA_ID_LBA_CAPACITY));
+        US_DEBUGP("      command_set_1 = 0x%x\n", id[ATA_ID_COMMAND_SET_1]);
+        US_DEBUGP("      command_set_2 = 0x%x\n", id[ATA_ID_COMMAND_SET_2]);
+}
 
 /**************************************************************************
  * isd200_get_inquiry_data
@@ -1163,7 +1111,7 @@ static int isd200_get_inquiry_data( struct us_data *us )
 {
         struct isd200_info *info = (struct isd200_info *)us->extra;
         int retStatus = ISD200_GOOD;
-        struct hd_driveid *id = info->id;
+        u16 *id = info->id;
 
         US_DEBUGP("Entering isd200_get_inquiry_data\n");
 
@@ -1180,8 +1128,7 @@ static int isd200_get_inquiry_data( struct us_data *us )
                         /* this must be an ATA device */
                         /* perform an ATA Command Identify */
                         transferStatus = isd200_action( us, ACTION_IDENTIFY,
-                                                        id, 
-                                                        sizeof(struct hd_driveid) );
+                                                        id, ATA_ID_WORDS * 2);
                         if (transferStatus != ISD200_TRANSPORT_GOOD) {
                                 /* Error issuing ATA Command Identify */
                                 US_DEBUGP("   Error issuing ATA Command Identify\n");
@@ -1191,35 +1138,9 @@ static int isd200_get_inquiry_data( struct us_data *us )
                                 int i;
                                 __be16 *src;
                                 __u16 *dest;
-                                isd200_fix_driveid(id);
 
-                                US_DEBUGP("   Identify Data Structure:\n");
-                                US_DEBUGP("      config = 0x%x\n", id->config);
-                                US_DEBUGP("      cyls = 0x%x\n", id->cyls);
-                                US_DEBUGP("      heads = 0x%x\n", id->heads);
-                                US_DEBUGP("      track_bytes = 0x%x\n", id->track_bytes);
-                                US_DEBUGP("      sector_bytes = 0x%x\n", id->sector_bytes);
-                                US_DEBUGP("      sectors = 0x%x\n", id->sectors);
-                                US_DEBUGP("      serial_no[0] = 0x%x\n", id->serial_no[0]);
-                                US_DEBUGP("      buf_type = 0x%x\n", id->buf_type);
-                                US_DEBUGP("      buf_size = 0x%x\n", id->buf_size);
-                                US_DEBUGP("      ecc_bytes = 0x%x\n", id->ecc_bytes);
-                                US_DEBUGP("      fw_rev[0] = 0x%x\n", id->fw_rev[0]);
-                                US_DEBUGP("      model[0] = 0x%x\n", id->model[0]);
-                                US_DEBUGP("      max_multsect = 0x%x\n", id->max_multsect);
-                                US_DEBUGP("      dword_io = 0x%x\n", id->dword_io);
-                                US_DEBUGP("      capability = 0x%x\n", id->capability);
-                                US_DEBUGP("      tPIO = 0x%x\n", id->tPIO);
-                                US_DEBUGP("      tDMA = 0x%x\n", id->tDMA);
-                                US_DEBUGP("      field_valid = 0x%x\n", id->field_valid);
-                                US_DEBUGP("      cur_cyls = 0x%x\n", id->cur_cyls);
-                                US_DEBUGP("      cur_heads = 0x%x\n", id->cur_heads);
-                                US_DEBUGP("      cur_sectors = 0x%x\n", id->cur_sectors);
-                                US_DEBUGP("      cur_capacity = 0x%x\n", (id->cur_capacity1 << 16) + id->cur_capacity0 );
-                                US_DEBUGP("      multsect = 0x%x\n", id->multsect);
-                                US_DEBUGP("      lba_capacity = 0x%x\n", id->lba_capacity);
-                                US_DEBUGP("      command_set_1 = 0x%x\n", id->command_set_1);
-                                US_DEBUGP("      command_set_2 = 0x%x\n", id->command_set_2);
+                                isd200_fix_driveid(id);
+                                isd200_dump_driveid(id);
 
                                 memset(&info->InquiryData, 0, sizeof(info->InquiryData));
 
@@ -1229,30 +1150,30 @@ static int isd200_get_inquiry_data( struct us_data *us )
                                 /* The length must be at least 36 (5 + 31) */
                                 info->InquiryData.AdditionalLength = 0x1F;
 
-                                if (id->command_set_1 & COMMANDSET_MEDIA_STATUS) {
+                                if (id[ATA_ID_COMMAND_SET_1] & COMMANDSET_MEDIA_STATUS) {
                                         /* set the removable bit */
                                         info->InquiryData.DeviceTypeModifier = DEVICE_REMOVABLE;
                                         info->DeviceFlags |= DF_REMOVABLE_MEDIA;
                                 }
 
                                 /* Fill in vendor identification fields */
-                                src = (__be16*)id->model;
+                                src = (__be16 *)&id[ATA_ID_PROD];
                                 dest = (__u16*)info->InquiryData.VendorId;
                                 for (i=0;i<4;i++)
                                         dest[i] = be16_to_cpu(src[i]);
 
-                                src = (__be16*)(id->model+8);
+                                src = (__be16 *)&id[ATA_ID_PROD + 8/2];
                                 dest = (__u16*)info->InquiryData.ProductId;
                                 for (i=0;i<8;i++)
                                         dest[i] = be16_to_cpu(src[i]);
 
-                                src = (__be16*)id->fw_rev;
+                                src = (__be16 *)&id[ATA_ID_FW_REV];
                                 dest = (__u16*)info->InquiryData.ProductRevisionLevel;
                                 for (i=0;i<2;i++)
                                         dest[i] = be16_to_cpu(src[i]);
 
                                 /* determine if it supports Media Status Notification */
-                                if (id->command_set_2 & COMMANDSET_MEDIA_STATUS) {
+                                if (id[ATA_ID_COMMAND_SET_2] & COMMANDSET_MEDIA_STATUS) {
                                         US_DEBUGP("   Device supports Media Status Notification\n");
 
                                         /* Indicate that it is enabled, even though it is not
@@ -1301,7 +1222,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
                               union ata_cdb * ataCdb)
 {
         struct isd200_info *info = (struct isd200_info *)us->extra;
-        struct hd_driveid *id = info->id;
+        u16 *id = info->id;
         int sendToTransport = 1;
         unsigned char sectnum, head;
         unsigned short cylinder;
@@ -1369,13 +1290,12 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
 
                 US_DEBUGP("   ATA OUT - SCSIOP_READ_CAPACITY\n");
 
-                if (id->capability & CAPABILITY_LBA ) {
-                        capacity = id->lba_capacity - 1;
-                } else {
-                        capacity = (id->heads *
-                                    id->cyls *
-                                    id->sectors) - 1;
-                }
+                if (ata_id_has_lba(id))
+                        capacity = ata_id_u32(id, ATA_ID_LBA_CAPACITY) - 1;
+                else
+                        capacity = (id[ATA_ID_HEADS] * id[ATA_ID_CYLS] *
+                                    id[ATA_ID_SECTORS]) - 1;
+
                 readCapacityData.LogicalBlockAddress = cpu_to_be32(capacity);
                 readCapacityData.BytesPerBlock = cpu_to_be32(0x200);
 
@@ -1392,16 +1312,16 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
                 lba = be32_to_cpu(*(__be32 *)&srb->cmnd[2]);
                 blockCount = (unsigned long)srb->cmnd[7]<<8 | (unsigned long)srb->cmnd[8];
 
-                if (id->capability & CAPABILITY_LBA) {
+                if (ata_id_has_lba(id)) {
                         sectnum = (unsigned char)(lba);
                         cylinder = (unsigned short)(lba>>8);
                         head = ATA_ADDRESS_DEVHEAD_LBA_MODE | (unsigned char)(lba>>24 & 0x0F);
                 } else {
-                        sectnum = (unsigned char)((lba % id->sectors) + 1);
-                        cylinder = (unsigned short)(lba / (id->sectors *
-                                                           id->heads));
-                        head = (unsigned char)((lba / id->sectors) %
-                                               id->heads);
+                        sectnum = (u8)((lba % id[ATA_ID_SECTORS]) + 1);
+                        cylinder = (u16)(lba / (id[ATA_ID_SECTORS] *
+                                        id[ATA_ID_HEADS]));
+                        head = (u8)((lba / id[ATA_ID_SECTORS]) %
+                                        id[ATA_ID_HEADS]);
                 }
                 ataCdb->generic.SignatureByte0 = info->ConfigData.ATAMajorCommand;
                 ataCdb->generic.SignatureByte1 = info->ConfigData.ATAMinorCommand;
@@ -1415,7 +1335,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
                 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
                 ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
                 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
-                ataCdb->write.CommandByte = WIN_READ;
+                ataCdb->write.CommandByte = ATA_CMD_PIO_READ;
                 break;
 
         case WRITE_10:
@@ -1424,14 +1344,16 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
                 lba = be32_to_cpu(*(__be32 *)&srb->cmnd[2]);
                 blockCount = (unsigned long)srb->cmnd[7]<<8 | (unsigned long)srb->cmnd[8];
 
-                if (id->capability & CAPABILITY_LBA) {
+                if (ata_id_has_lba(id)) {
                         sectnum = (unsigned char)(lba);
                         cylinder = (unsigned short)(lba>>8);
                         head = ATA_ADDRESS_DEVHEAD_LBA_MODE | (unsigned char)(lba>>24 & 0x0F);
                 } else {
-                        sectnum = (unsigned char)((lba % id->sectors) + 1);
-                        cylinder = (unsigned short)(lba / (id->sectors * id->heads));
-                        head = (unsigned char)((lba / id->sectors) % id->heads);
+                        sectnum = (u8)((lba % id[ATA_ID_SECTORS]) + 1);
+                        cylinder = (u16)(lba / (id[ATA_ID_SECTORS] *
+                                        id[ATA_ID_HEADS]));
+                        head = (u8)((lba / id[ATA_ID_SECTORS]) %
+                                        id[ATA_ID_HEADS]);
                 }
                 ataCdb->generic.SignatureByte0 = info->ConfigData.ATAMajorCommand;
                 ataCdb->generic.SignatureByte1 = info->ConfigData.ATAMinorCommand;
@@ -1445,7 +1367,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
                 ataCdb->write.CylinderHighByte = (unsigned char)(cylinder>>8);
                 ataCdb->write.CylinderLowByte = (unsigned char)cylinder;
                 ataCdb->write.DeviceHeadByte = (head | ATA_ADDRESS_DEVHEAD_STD);
-                ataCdb->write.CommandByte = WIN_WRITE;
+                ataCdb->write.CommandByte = ATA_CMD_PIO_WRITE;
                 break;
 
         case ALLOW_MEDIUM_REMOVAL:
@@ -1459,7 +1381,7 @@ static int isd200_scsi_to_ata(struct scsi_cmnd *srb, struct us_data *us,
                         ataCdb->generic.TransferBlockSize = 1;
                         ataCdb->generic.RegisterSelect = REG_COMMAND;
                         ataCdb->write.CommandByte = (srb->cmnd[4] & 0x1) ?
-                                WIN_DOORLOCK : WIN_DOORUNLOCK;
+                                ATA_CMD_MEDIA_LOCK : ATA_CMD_MEDIA_UNLOCK;
                         isd200_srb_set_bufflen(srb, 0);
                 } else {
                         US_DEBUGP("   Not removeable media, just report okay\n");
@@ -1539,8 +1461,7 @@ static int isd200_init_info(struct us_data *us)
         if (!info)
                 retStatus = ISD200_ERROR;
         else {
-                info->id = (struct hd_driveid *)
-                                kzalloc(sizeof(struct hd_driveid), GFP_KERNEL);
+                info->id = kzalloc(ATA_ID_WORDS * 2, GFP_KERNEL);
                 info->RegsBuf = (unsigned char *)
                                 kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
                 info->srb.sense_buffer =
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index f0aac0cf315a..386eaa22d215 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -471,7 +471,7 @@ static void __wusbhc_keep_alive(struct wusbhc *wusbhc)
  */
 static void wusbhc_keep_alive_run(struct work_struct *ws)
 {
-        struct delayed_work *dw = container_of(ws, struct delayed_work, work);
+        struct delayed_work *dw = to_delayed_work(ws);
         struct wusbhc *wusbhc = container_of(dw, struct wusbhc, keep_alive_timer);
 
         mutex_lock(&wusbhc->mutex);
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 8118db7f1d8d..b2f149fedcc5 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -562,7 +562,7 @@ void wusbhc_gtk_rekey(struct wusbhc *wusbhc)
                 struct wusb_dev *wusb_dev;
 
                 wusb_dev = wusbhc->port[p].wusb_dev;
-                if (!wusb_dev || !wusb_dev->usb_dev | !wusb_dev->usb_dev->authenticated)
+                if (!wusb_dev || !wusb_dev->usb_dev || !wusb_dev->usb_dev->authenticated)
                         continue;
 
                 usb_fill_control_urb(wusb_dev->set_gtk_urb, wusb_dev->usb_dev,