ide: add device flags

[linux-2.6-omap-h63xx.git] / drivers / ide / legacy / ht6560b.c

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 7bc8fd59ea9ee336dbcab2a5981c0bf696df6401..c7e5c2246b79e1b29836055921e116daacafe102 100644 (file)
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -3,34 +3,12 @@
  */
 
 /*
- *
- *  Version 0.01        Initial version hacked out of ide.c
- *
- *  Version 0.02        Added support for PIO modes, auto-tune
- *
- *  Version 0.03        Some cleanups
- *
- *  Version 0.05        PIO mode cycle timings auto-tune using bus-speed
- *
- *  Version 0.06        Prefetch mode now defaults no OFF. To set
- *                      prefetch mode OFF/ON use "hdparm -p8/-p9".
- *                      Unmask irq is disabled when prefetch mode
- *                      is enabled.
- *
- *  Version 0.07        Trying to fix CD-ROM detection problem.
- *                      "Prefetch" mode bit OFF for ide disks and
- *                      ON for anything else.
- *
- *  Version 0.08        Need to force prefetch for CDs and other non-disk
- *                      devices. (not sure which devices exactly need
- *                      prefetch)
- *
  *  HT-6560B EIDE-controller support
  *  To activate controller support use kernel parameter "ide0=ht6560b".
  *  Use hdparm utility to enable PIO mode support.
  *
  *  Author:    Mikko Ala-Fossi            <maf@iki.fi>
- *             Jan Evert van Grootheest   <janevert@caiway.nl>
+ *             Jan Evert van Grootheest   <j.e.van.grootheest@caiway.nl>
  *
  *  Try:  http://www.maf.iki.fi/~maf/ht6560b/
  */
@@ -46,7 +24,6 @@
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/blkdev.h>
-#include <linux/hdreg.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
@@ -143,7 +120,8 @@ static void ht6560b_selectproc (ide_drive_t *drive)
         * Need to enforce prefetch sometimes because otherwise
         * it'll hang (hard).
         */
-       if (drive->media != ide_disk || !drive->present)
+       if (drive->media != ide_disk ||
+           (drive->dev_flags & IDE_DFLAG_PRESENT) == 0)
                select |= HT_PREFETCH_MODE;
 
        if (select != current_select || timing != current_timing) {
@@ -272,11 +250,11 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
         */
        if (state) {
                drive->drive_data |= t;   /* enable prefetch mode */
-               drive->no_unmask = 1;
-               drive->unmask = 0;
+               drive->dev_flags |= IDE_DFLAG_NO_UNMASK;
+               drive->dev_flags &= ~IDE_DFLAG_UNMASK;
        } else {
                drive->drive_data &= ~t;  /* disable prefetch mode */
-               drive->no_unmask = 0;
+               drive->dev_flags &= ~IDE_DFLAG_NO_UNMASK;
        }
 
        spin_unlock_irqrestore(&ht6560b_lock, flags);