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: (60 commits)
  ide: small whitespace fixes
  ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings
  ide: ide-cd.c fix sparse endianness warnings
  ide-cd: convert to using the new atapi_flags
  ide: remove unused PC_FLAG_DRQ_INTERRUPT
  ide-scsi: convert to using the new atapi_flags
  ide-tape: convert to using the new atapi_flags
  ide-floppy: convert to using the new atapi_flags (take 2)
  ide: add per-device flags
  ide: use rq->cmd instead of pc->c in atapi common code
  ide-scsi: pass packet command in rq->cmd
  ide-tape: pass packet command in rq->cmd
  ide-tape: make room for packet command ids in rq->cmd
  ide-floppy: pass packet command in rq->cmd
  ide: remove pc->callback member from ide_atapi_pc
  ide-scsi: use drive->pc_callback instead of pc->callback
  ide-tape: use drive->pc_callback instead of pc->callback
  ide-floppy: use drive->pc_callback instead of pc->callback
  ide: push pc callback pointer into the ide_drive_t structure
  drivers/ide/ide-tape.c: remove double kfree
  ...

1 files changed, 3 insertions, 14 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 13af72f09ec4..97fefabea8b8 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -266,22 +266,11 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 
         rate = ide_rate_filter(drive, rate);
 
+        BUG_ON(rate < XFER_PIO_0);
+
         if (rate >= XFER_PIO_0 && rate <= XFER_PIO_5)
                 return ide_set_pio_mode(drive, rate);
 
-        /*
-         * TODO: transfer modes 0x00-0x07 passed from the user-space are
-         * currently handled here which needs fixing (please note that such
-         * case could happen iff the transfer mode has already been set on
-         * the device by ide-proc.c::set_xfer_rate()).
-         */
-        if (rate < XFER_PIO_0) {
-                if (hwif->host_flags & IDE_HFLAG_ABUSE_SET_DMA_MODE)
-                        return ide_set_dma_mode(drive, rate);
-                else
-                        return ide_config_drive_speed(drive, rate);
-        }
-
         return ide_set_dma_mode(drive, rate);
 }
 
@@ -336,7 +325,7 @@ static void ide_dump_sector(ide_drive_t *drive)
         else
                 task.tf_flags = IDE_TFLAG_IN_LBA | IDE_TFLAG_IN_DEVICE;
 
-        drive->hwif->tf_read(drive, &task);
+        drive->hwif->tp_ops->tf_read(drive, &task);
 
         if (lba48 || (tf->device & ATA_LBA))
                 printk(", LBAsect=%llu",