7 files changed, 23 insertions, 17 deletions

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 824471f91bf5..7dbc692c84c3 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -92,7 +92,7 @@ static void amd_set_drive(ide_drive_t *drive, const u8 speed)
 
         ide_timing_compute(drive, speed, &t, T, UT);
 
-        if (peer->present) {
+        if (peer->dev_flags & IDE_DFLAG_PRESENT) {
                 ide_timing_compute(peer, peer->current_speed, &p, T, UT);
                 ide_timing_merge(&p, &t, &t, IDE_TIMING_8BIT);
         }
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 7f39cdb41410..d3afdffcb07a 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -378,13 +378,13 @@ static void __set_prefetch_mode(ide_drive_t *drive, int mode)
 {
         if (mode) {     /* want prefetch on? */
 #if CMD640_PREFETCH_MASKS
-                drive->no_unmask = 1;
-                drive->unmask = 0;
+                drive->dev_flags |= IDE_DFLAG_NO_UNMASK;
+                drive->dev_flags &= ~IDE_DFLAG_UNMASK;
 #endif
-                drive->no_io_32bit = 0;
+                drive->dev_flags &= ~IDE_DFLAG_NO_IO_32BIT;
         } else {
-                drive->no_unmask = 0;
-                drive->no_io_32bit = 1;
+                drive->dev_flags &= ~IDE_DFLAG_NO_UNMASK;
+                drive->dev_flags |= IDE_DFLAG_NO_IO_32BIT;
                 drive->io_32bit = 0;
         }
 }
@@ -471,7 +471,7 @@ static void program_drive_counts(ide_drive_t *drive, unsigned int index)
                 ide_drive_t *peer = &hwif->drives[!drive->select.b.unit];
                 unsigned int mate = index ^ 1;
 
-                if (peer->present) {
+                if (peer->dev_flags & IDE_DFLAG_PRESENT) {
                         if (setup_count < setup_counts[mate])
                                 setup_count = setup_counts[mate];
                         if (active_count < active_counts[mate])
@@ -626,7 +626,7 @@ static void cmd640_init_dev(ide_drive_t *drive)
          */
         check_prefetch(drive, i);
         printk(KERN_INFO DRV_NAME ": drive%d timings/prefetch(%s) preserved\n",
-                                  i, drive->no_io_32bit ? "off" : "on");
+                i, (drive->dev_flags & IDE_DFLAG_NO_IO_32BIT) ? "off" : "on");
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 }
 
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 46edd083b348..b761015ee190 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -454,7 +454,7 @@ static void it821x_quirkproc(ide_drive_t *drive)
                  *      IRQ mask as we may well be in PIO (eg rev 0x10)
                  *      for now and we know unmasking is safe on this chipset.
                  */
-                drive->unmask = 1;
+                drive->dev_flags |= IDE_DFLAG_UNMASK;
         } else {
         /*
          *      Perform fixups on smart mode. We need to "lose" some
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 53bd645736d9..99e98e5e271c 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -137,7 +137,7 @@ static void __devinit superio_init_iops(struct hwif_s *hwif)
 static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
 
 /*
- * This routine either enables/disables (according to drive->present)
+ * This routine either enables/disables (according to IDE_DFLAG_PRESENT)
  * the IRQ associated with the port (HWIF(drive)),
  * and selects either PIO or DMA handshaking for the next I/O operation.
  */
@@ -153,7 +153,11 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 
         /* Adjust IRQ enable bit */
         bit = 1 << (8 + hwif->channel);
-        new = drive->present ? (new & ~bit) : (new | bit);
+
+        if (drive->dev_flags & IDE_DFLAG_PRESENT)
+                new &= ~bit;
+        else
+                new |= bit;
 
         /* Select PIO or DMA, DMA may only be selected for one drive/channel. */
         bit   = 1 << (20 + drive->select.b.unit       + (hwif->channel << 1));
@@ -187,7 +191,8 @@ static void ns87415_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 
 static void ns87415_selectproc (ide_drive_t *drive)
 {
-        ns87415_prepare_drive (drive, drive->using_dma);
+        ns87415_prepare_drive(drive,
+                              !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
 }
 
 static int ns87415_dma_end(ide_drive_t *drive)
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index cb6d2a00c514..6d9240a9dcfa 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -168,7 +168,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)
 {
         if (drive->current_speed > XFER_UDMA_2)
                 pdc_old_enable_66MHz_clock(drive->hwif);
-        if (drive->media != ide_disk || drive->addressing == 1) {
+        if (drive->media != ide_disk || (drive->dev_flags & IDE_DFLAG_LBA48)) {
                 struct request *rq      = HWGROUP(drive)->rq;
                 ide_hwif_t *hwif        = HWIF(drive);
                 unsigned long high_16   = hwif->extra_base - 16;
@@ -188,7 +188,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)
 
 static int pdc202xx_dma_end(ide_drive_t *drive)
 {
-        if (drive->media != ide_disk || drive->addressing == 1) {
+        if (drive->media != ide_disk || (drive->dev_flags & IDE_DFLAG_LBA48)) {
                 ide_hwif_t *hwif        = HWIF(drive);
                 unsigned long high_16   = hwif->extra_base - 16;
                 unsigned long atapi_reg = high_16 + (hwif->channel ? 0x24 : 0x20);
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index bdc1fed41260..50405ed6f0cb 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -216,7 +216,8 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
         if (mode != -1) {
                 printk("SC1200: %s: changing (U)DMA mode\n", drive->name);
                 ide_dma_off_quietly(drive);
-                if (ide_set_dma_mode(drive, mode) == 0 && drive->using_dma)
+                if (ide_set_dma_mode(drive, mode) == 0 &&
+                    (drive->dev_flags & IDE_DFLAG_USING_DMA))
                         hwif->dma_ops->dma_host_set(drive, 1);
                 return;
         }
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 4dfbc6a68b5b..c12ffbb28748 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -161,7 +161,7 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
         }
 
         /* enable IRQ if not probing */
-        if (drive->present) {
+        if (drive->dev_flags & IDE_DFLAG_PRESENT) {
                 reg = inw(hwif->config_data + 3);
                 reg &= 0x13;
                 reg &= ~(1 << hwif->channel);
@@ -173,7 +173,7 @@ static void trm290_prepare_drive (ide_drive_t *drive, unsigned int use_dma)
 
 static void trm290_selectproc (ide_drive_t *drive)
 {
-        trm290_prepare_drive(drive, drive->using_dma);
+        trm290_prepare_drive(drive, !!(drive->dev_flags & IDE_DFLAG_USING_DMA));
 }
 
 static void trm290_dma_exec_cmd(ide_drive_t *drive, u8 command)