Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (29 commits)
  ide: re-implement ide_pci_init_one() on top of ide_pci_init_two()
  ide: unexport ide_find_dma_mode()
  ide: fix PowerMac bootup oops
  ide: skip probe if there are no devices on the port (v2)
  sl82c105: add printk() logging facility
  ide-tape: fix proc warning
  ide: add IDE_DFLAG_NIEN_QUIRK device flag
  ide: respect quirk_drives[] list on all controllers
  hpt366: enable all quirks for devices on quirk_drives[] list
  hpt366: sync quirk_drives[] list with pdc202xx_{new,old}.c
  ide: remove superfluous SELECT_MASK() call from do_rw_taskfile()
  ide: remove superfluous SELECT_MASK() call from ide_driveid_update()
  icside: remove superfluous ->maskproc method
  ide-tape: fix IDE_AFLAG_* atomic accesses
  ide-tape: change IDE_AFLAG_IGNORE_DSC non-atomically
  pdc202xx_old: kill resetproc() method
  pdc202xx_old: don't call pdc202xx_reset() on IRQ timeout
  pdc202xx_old: use ide_dma_test_irq()
  ide: preserve Host Protected Area by default (v2)
  ide-gd: implement block device ->set_capacity method (v2)
  ...

1 files changed, 35 insertions, 42 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index bba4297f2f03..272cc38f6dbe 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -184,29 +184,42 @@ static void ide_tf_set_setmult_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
         tf->command = ATA_CMD_SET_MULTI;
 }
 
-static ide_startstop_t ide_disk_special(ide_drive_t *drive)
+/**
+ *      do_special              -       issue some special commands
+ *      @drive: drive the command is for
+ *
+ *      do_special() is used to issue ATA_CMD_INIT_DEV_PARAMS,
+ *      ATA_CMD_RESTORE and ATA_CMD_SET_MULTI commands to a drive.
+ */
+
+static ide_startstop_t do_special(ide_drive_t *drive)
 {
-        special_t *s = &drive->special;
         struct ide_cmd cmd;
 
+#ifdef DEBUG
+        printk(KERN_DEBUG "%s: %s: 0x%02x\n", drive->name, __func__,
+                drive->special_flags);
+#endif
+        if (drive->media != ide_disk) {
+                drive->special_flags = 0;
+                drive->mult_req = 0;
+                return ide_stopped;
+        }
+
         memset(&cmd, 0, sizeof(cmd));
         cmd.protocol = ATA_PROT_NODATA;
 
-        if (s->b.set_geometry) {
-                s->b.set_geometry = 0;
+        if (drive->special_flags & IDE_SFLAG_SET_GEOMETRY) {
+                drive->special_flags &= ~IDE_SFLAG_SET_GEOMETRY;
                 ide_tf_set_specify_cmd(drive, &cmd.tf);
-        } else if (s->b.recalibrate) {
-                s->b.recalibrate = 0;
+        } else if (drive->special_flags & IDE_SFLAG_RECALIBRATE) {
+                drive->special_flags &= ~IDE_SFLAG_RECALIBRATE;
                 ide_tf_set_restore_cmd(drive, &cmd.tf);
-        } else if (s->b.set_multmode) {
-                s->b.set_multmode = 0;
+        } else if (drive->special_flags & IDE_SFLAG_SET_MULTMODE) {
+                drive->special_flags &= ~IDE_SFLAG_SET_MULTMODE;
                 ide_tf_set_setmult_cmd(drive, &cmd.tf);
-        } else if (s->all) {
-                int special = s->all;
-                s->all = 0;
-                printk(KERN_ERR "%s: bad special flag: 0x%02x\n", drive->name, special);
-                return ide_stopped;
-        }
+        } else
+                BUG();
 
         cmd.valid.out.tf = IDE_VALID_OUT_TF | IDE_VALID_DEVICE;
         cmd.valid.in.tf  = IDE_VALID_IN_TF  | IDE_VALID_DEVICE;
@@ -217,31 +230,6 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
         return ide_started;
 }
 
-/**
- *      do_special              -       issue some special commands
- *      @drive: drive the command is for
- *
- *      do_special() is used to issue ATA_CMD_INIT_DEV_PARAMS,
- *      ATA_CMD_RESTORE and ATA_CMD_SET_MULTI commands to a drive.
- *
- *      It used to do much more, but has been scaled back.
- */
-
-static ide_startstop_t do_special (ide_drive_t *drive)
-{
-        special_t *s = &drive->special;
-
-#ifdef DEBUG
-        printk("%s: do_special: 0x%02x\n", drive->name, s->all);
-#endif
-        if (drive->media == ide_disk)
-                return ide_disk_special(drive);
-
-        s->all = 0;
-        drive->mult_req = 0;
-        return ide_stopped;
-}
-
 void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         ide_hwif_t *hwif = drive->hwif;
@@ -351,7 +339,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                 printk(KERN_ERR "%s: drive not ready for command\n", drive->name);
                 return startstop;
         }
-        if (!drive->special.all) {
+
+        if (drive->special_flags == 0) {
                 struct ide_driver *drv;
 
                 /*
@@ -499,11 +488,15 @@ repeat:
 
                 if ((hwif->host->host_flags & IDE_HFLAG_SERIALIZE) &&
                     hwif != prev_port) {
+                        ide_drive_t *cur_dev =
+                                prev_port ? prev_port->cur_dev : NULL;
+
                         /*
                          * set nIEN for previous port, drives in the
-                         * quirk_list may not like intr setups/cleanups
+                         * quirk list may not like intr setups/cleanups
                          */
-                        if (prev_port && prev_port->cur_dev->quirk_list == 0)
+                        if (cur_dev &&
+                            (cur_dev->dev_flags & IDE_DFLAG_NIEN_QUIRK) == 0)
                                 prev_port->tp_ops->write_devctl(prev_port,
                                                                 ATA_NIEN |
                                                                 ATA_DEVCTL_OBS);