9 files changed, 56 insertions, 49 deletions

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index d647526af557..fcc701b3c0a2 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -134,8 +134,8 @@ static u8 ali_udma_filter(ide_drive_t *drive)
         if (m5229_revision > 0x20 && m5229_revision < 0xC2) {
                 if (drive->media != ide_disk)
                         return 0;
-                if (chip_is_1543c_e && strstr(drive->id->model, "WDC ") &&
-                    wdc_udma == 0)
+                if (wdc_udma == 0 && chip_is_1543c_e &&
+                    strstr((char *)&drive->id[ATA_ID_PROD], "WDC "))
                         return 0;
         }
 
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index f235db8c678b..774ff58603a2 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -82,16 +82,18 @@ static u8 cs5530_udma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         ide_drive_t *mate = &hwif->drives[(drive->dn & 1) ^ 1];
-        struct hd_driveid *mateid = mate->id;
+        u16 *mateid = mate->id;
         u8 mask = hwif->ultra_mask;
 
         if (mate->present == 0)
                 goto out;
 
-        if ((mateid->capability & 1) && __ide_dma_bad_drive(mate) == 0) {
-                if ((mateid->field_valid & 4) && (mateid->dma_ultra & 7))
+        if ((mate->driveid->capability & 1) && __ide_dma_bad_drive(mate) == 0) {
+                if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
+                    (mateid[ATA_ID_UDMA_MODES] & 7))
                         goto out;
-                if ((mateid->field_valid & 2) && (mateid->dma_mword & 7))
+                if ((mateid[ATA_ID_FIELD_VALID] & 2) &&
+                    (mateid[ATA_ID_MWDMA_MODES] & 7))
                         mask = 0;
         }
 out:
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index c37ab1743819..b7f77fd3cb6e 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -605,10 +605,10 @@ static const struct hpt_info hpt371n __devinitdata = {
 
 static int check_in_drive_list(ide_drive_t *drive, const char **list)
 {
-        struct hd_driveid *id = drive->id;
+        char *m = (char *)&drive->id[ATA_ID_PROD];
 
         while (*list)
-                if (!strcmp(*list++,id->model))
+                if (!strcmp(*list++, m))
                         return 1;
         return 0;
 }
@@ -731,11 +731,11 @@ static void hpt3xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static void hpt3xx_quirkproc(ide_drive_t *drive)
 {
-        struct hd_driveid *id   = drive->id;
+        char *m                 = (char *)&drive->id[ATA_ID_PROD];
         const  char **list      = quirk_drives;
 
         while (*list)
-                if (strstr(id->model, *list++)) {
+                if (strstr(m, *list++)) {
                         drive->quirk_list = 1;
                         return;
                 }
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 4a1508a707cc..31d4e6aef1b8 100644
--- 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 */
+                        drive->driveid->capability |= 3;      /* 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 (drive->driveid->capability & 1) {
+                        id[ATA_ID_MWDMA_MODES] |= 0x0101;
                         drive->current_speed = XFER_MW_DMA_0;
                 }
         }
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index d477da6b5858..7ecfcd06f47e 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -203,10 +203,10 @@ static u8 pdcnew_cable_detect(ide_hwif_t *hwif)
 
 static void pdcnew_quirkproc(ide_drive_t *drive)
 {
-        const char **list, *model = drive->id->model;
+        const char **list, *m = (char *)&drive->id[ATA_ID_PROD];
 
         for (list = pdc_quirk_drives; *list != NULL; list++)
-                if (strstr(model, *list) != NULL) {
+                if (strstr(m, *list) != NULL) {
                         drive->quirk_list = 2;
                         return;
                 }
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index de9a27400462..23e861b177ce 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -86,7 +86,7 @@ static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed)
                  * Prefetch_EN / IORDY_EN / PA[3:0] bits of register A
                  */
                 AP &= ~0x3f;
-                if (drive->id->capability & 4)
+                if (drive->driveid->capability & 4)
                         AP |= 0x20;     /* set IORDY_EN bit */
                 if (drive->media == ide_disk)
                         AP |= 0x10;     /* set Prefetch_EN bit */
@@ -154,10 +154,10 @@ static void pdc_old_disable_66MHz_clock(ide_hwif_t *hwif)
 
 static void pdc202xx_quirkproc(ide_drive_t *drive)
 {
-        const char **list, *model = drive->id->model;
+        const char **list, *m = (char *)&drive->id[ATA_ID_PROD];
 
         for (list = pdc_quirk_drives; *list != NULL; list++)
-                if (strstr(model, *list) != NULL) {
+                if (strstr(m, *list) != NULL) {
                         drive->quirk_list = 2;
                         return;
                 }
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 8efaed16fea3..5c8367df14e4 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -105,16 +105,18 @@ static u8 sc1200_udma_filter(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         ide_drive_t *mate = &hwif->drives[(drive->dn & 1) ^ 1];
-        struct hd_driveid *mateid = mate->id;
+        u16 *mateid = mate->id;
         u8 mask = hwif->ultra_mask;
 
         if (mate->present == 0)
                 goto out;
 
-        if ((mateid->capability & 1) && __ide_dma_bad_drive(mate) == 0) {
-                if ((mateid->field_valid & 4) && (mateid->dma_ultra & 7))
+        if ((mate->driveid->capability & 1) && __ide_dma_bad_drive(mate) == 0) {
+                if ((mateid[ATA_ID_FIELD_VALID] & 4) &&
+                    (mateid[ATA_ID_UDMA_MODES] & 7))
                         goto out;
-                if ((mateid->field_valid & 2) && (mateid->dma_mword & 7))
+                if ((mateid[ATA_ID_FIELD_VALID] & 2) &&
+                    (mateid[ATA_ID_MWDMA_MODES] & 7))
                         mask = 0;
         }
 out:
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index c3bdc6e51a48..ded6a13fd406 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -57,8 +57,10 @@ static struct pci_dev *isa_dev;
 
 static int check_in_drive_lists (ide_drive_t *drive, const char **list)
 {
+        char *m = (char *)&drive->id[ATA_ID_PROD];
+
         while (*list)
-                if (!strcmp(*list++, drive->id->model))
+                if (!strcmp(*list++, m))
                         return 1;
         return 0;
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index db2b88a369ab..7b5bd8729f64 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -223,7 +223,9 @@ static u8 sil_pata_udma_filter(ide_drive_t *drive)
 
 static u8 sil_sata_udma_filter(ide_drive_t *drive)
 {
-        return strstr(drive->id->model, "Maxtor") ? ATA_UDMA5 : ATA_UDMA6;
+        char *m = (char *)&drive->id[ATA_ID_PROD];
+
+        return strstr(m, "Maxtor") ? ATA_UDMA5 : ATA_UDMA6;
 }
 
 /**
@@ -616,8 +618,8 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
 
 static int is_dev_seagate_sata(ide_drive_t *drive)
 {
-        const char *s   = &drive->id->model[0];
-        unsigned len    = strnlen(s, sizeof(drive->id->model));
+        const char *s   = (const char *)&drive->id[ATA_ID_PROD];
+        unsigned len    = strnlen(s, ATA_ID_PROD_LEN);
 
         if ((len > 4) && (!memcmp(s, "ST", 2)))
                 if ((!memcmp(s + len - 2, "AS", 2)) ||