Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (59 commits)
  ide-floppy: do not complete rq's prematurely
  ide: be able to build pmac driver without IDE built-in
  ide-pmac: IDE cable detection on Apple PowerBook
  ide: inline SELECT_DRIVE()
  ide: turn selectproc() method into dev_select() method (take 5)
  MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
  ide: move data register access out of tf_{read|load}() methods (take 2)
  ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
  ide-io-std: shorten ide_{in|out}put_data()
  ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
  ide: turn set_irq() method into write_devctl() method
  ide: use ATA_HOB
  ide-disk: use ATA_ERR
  ide: add support for CFA specified transfer modes (take 3)
  ide-iops: only clear DMA words on setting DMA mode
  ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
  au1xxx-ide: auide_{in|out}sw() should be static
  ide-floppy: use ide_pio_bytes()
  ide-{floppy,tape}: fix padding for PIO transfers
  ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option
  ...

1 files changed, 19 insertions, 8 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1adc5e2e7fb..1deb6d29b18 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -73,6 +73,7 @@ EXPORT_SYMBOL_GPL(ide_end_rq);
 
 void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
 {
+        const struct ide_tp_ops *tp_ops = drive->hwif->tp_ops;
         struct ide_taskfile *tf = &cmd->tf;
         struct request *rq = cmd->rq;
         u8 tf_cmd = tf->command;
@@ -80,7 +81,16 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)
         tf->error = err;
         tf->status = stat;
 
-        drive->hwif->tp_ops->tf_read(drive, cmd);
+        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
+                u8 data[2];
+
+                tp_ops->input_data(drive, cmd, data, 2);
+
+                tf->data = data[0];
+                tf->hob_data = data[1];
+        }
+
+        tp_ops->tf_read(drive, cmd);
 
         if ((cmd->tf_flags & IDE_TFLAG_CUSTOM_HANDLER) &&
             tf_cmd == ATA_CMD_IDLEIMMEDIATE) {
@@ -338,7 +348,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
         if (blk_pm_request(rq))
                 ide_check_pm_state(drive, rq);
 
-        SELECT_DRIVE(drive);
+        drive->hwif->tp_ops->dev_select(drive);
         if (ide_wait_stat(&startstop, drive, drive->ready_stat,
                           ATA_BUSY | ATA_DRQ, WAIT_READY)) {
                 printk(KERN_ERR "%s: drive not ready for command\n", drive->name);
@@ -481,11 +491,10 @@ repeat:
                 prev_port = hwif->host->cur_port;
                 hwif->rq = NULL;
 
-                if (drive->dev_flags & IDE_DFLAG_SLEEPING) {
-                        if (time_before(drive->sleep, jiffies)) {
-                                ide_unlock_port(hwif);
-                                goto plug_device;
-                        }
+                if (drive->dev_flags & IDE_DFLAG_SLEEPING &&
+                    time_after(drive->sleep, jiffies)) {
+                        ide_unlock_port(hwif);
+                        goto plug_device;
                 }
 
                 if ((hwif->host->host_flags & IDE_HFLAG_SERIALIZE) &&
@@ -495,7 +504,9 @@ repeat:
                          * quirk_list may not like intr setups/cleanups
                          */
                         if (prev_port && prev_port->cur_dev->quirk_list == 0)
-                                prev_port->tp_ops->set_irq(prev_port, 0);
+                                prev_port->tp_ops->write_devctl(prev_port,
+                                                                ATA_NIEN |
+                                                                ATA_DEVCTL_OBS);
 
                         hwif->host->cur_port = hwif;
                 }