ide: remove drive->driveid

[linux-2.6-omap-h63xx.git] / drivers / ide / pci / it821x.c

diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 4a1508a707cc76ba73c7df440d224d88d0f5b4a8..ed24065f74e8c2c7ad8bc1926a4d5fedb13404aa 100644 (file)
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -446,8 +446,7 @@ static u8 it821x_cable_detect(ide_hwif_t *hwif)
 static void it821x_quirkproc(ide_drive_t *drive)
 {
        struct it821x_dev *itdev = ide_get_hwifdata(drive->hwif);
-       struct hd_driveid *id = drive->id;
-       u16 *idbits = (u16 *)drive->id;
+       u16 *id = drive->id;
 
        if (!itdev->smart) {
                /*
@@ -466,36 +465,36 @@ static void it821x_quirkproc(ide_drive_t *drive)
         */
 
                /* Check for RAID v native */
-               if(strstr(id->model, "Integrated Technology Express")) {
+               if (strstr((char *)&id[ATA_ID_PROD],
+                          "Integrated Technology Express")) {
                        /* In raid mode the ident block is slightly buggy
                           We need to set the bits so that the IDE layer knows
                           LBA28. LBA48 and DMA ar valid */
-                       id->capability |= 3;            /* LBA28, DMA */
-                       id->command_set_2 |= 0x0400;    /* LBA48 valid */
-                       id->cfs_enable_2 |= 0x0400;     /* LBA48 on */
+                       id[ATA_ID_CAPABILITY]    |= (3 << 8); /* LBA28, DMA */
+                       id[ATA_ID_COMMAND_SET_2] |= 0x0400;   /* LBA48 valid */
+                       id[ATA_ID_CFS_ENABLE_2]  |= 0x0400;   /* LBA48 on */
                        /* Reporting logic */
                        printk(KERN_INFO "%s: IT8212 %sRAID %d volume",
-                               drive->name,
-                               idbits[147] ? "Bootable ":"",
-                               idbits[129]);
-                               if(idbits[129] != 1)
-                                       printk("(%dK stripe)", idbits[146]);
-                               printk(".\n");
+                               drive->name, id[147] ? "Bootable " : "",
+                               id[ATA_ID_CSFO]);
+                       if (id[ATA_ID_CSFO] != 1)
+                               printk(KERN_CONT "(%dK stripe)", id[146]);
+                       printk(KERN_CONT ".\n");
                } else {
                        /* Non RAID volume. Fixups to stop the core code
                           doing unsupported things */
-                       id->field_valid &= 3;
-                       id->queue_depth = 0;
-                       id->command_set_1 = 0;
-                       id->command_set_2 &= 0xC400;
-                       id->cfsse &= 0xC000;
-                       id->cfs_enable_1 = 0;
-                       id->cfs_enable_2 &= 0xC400;
-                       id->csf_default &= 0xC000;
-                       id->word127 = 0;
-                       id->dlf = 0;
-                       id->csfo = 0;
-                       id->cfa_power = 0;
+                       id[ATA_ID_FIELD_VALID]   &= 3;
+                       id[ATA_ID_QUEUE_DEPTH]    = 0;
+                       id[ATA_ID_COMMAND_SET_1]  = 0;
+                       id[ATA_ID_COMMAND_SET_2] &= 0xC400;
+                       id[ATA_ID_CFSSE]         &= 0xC000;
+                       id[ATA_ID_CFS_ENABLE_1]   = 0;
+                       id[ATA_ID_CFS_ENABLE_2]  &= 0xC400;
+                       id[ATA_ID_CSF_DEFAULT]   &= 0xC000;
+                       id[127]                   = 0;
+                       id[ATA_ID_DLF]            = 0;
+                       id[ATA_ID_CSFO]           = 0;
+                       id[ATA_ID_CFA_POWER]      = 0;
                        printk(KERN_INFO "%s: Performing identify fixups.\n",
                                drive->name);
                }
@@ -505,8 +504,8 @@ static void it821x_quirkproc(ide_drive_t *drive)
                 * IDE core that DMA is supported (it821x hardware
                 * takes care of DMA mode programming).
                 */
-               if (id->capability & 1) {
-                       id->dma_mword |= 0x0101;
+               if (ata_id_has_dma(id)) {
+                       id[ATA_ID_MWDMA_MODES] |= 0x0101;
                        drive->current_speed = XFER_MW_DMA_0;
                }
        }