1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index 159eb39c7932..d93c80016326 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -61,12 +61,12 @@ static u8 superio_dma_sff_read_status(ide_hwif_t *hwif)
         return superio_ide_inb(hwif->dma_base + ATA_DMA_STATUS);
 }
 
-static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
+static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 {
         struct ide_io_ports *io_ports = &drive->hwif->io_ports;
-        struct ide_taskfile *tf = &task->tf;
+        struct ide_taskfile *tf = &cmd->tf;
 
-        if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {
+        if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
                 u16 data = inw(io_ports->data_addr);
 
                 tf->data = data & 0xff;
@@ -76,31 +76,31 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
         /* be sure we're looking at the low order bits */
         outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
-        if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
+        if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
                 tf->feature = inb(io_ports->feature_addr);
-        if (task->tf_flags & IDE_TFLAG_IN_NSECT)
+        if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
-        if (task->tf_flags & IDE_TFLAG_IN_LBAL)
+        if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
                 tf->lbal   = inb(io_ports->lbal_addr);
-        if (task->tf_flags & IDE_TFLAG_IN_LBAM)
+        if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)
                 tf->lbam   = inb(io_ports->lbam_addr);
-        if (task->tf_flags & IDE_TFLAG_IN_LBAH)
+        if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)
                 tf->lbah   = inb(io_ports->lbah_addr);
-        if (task->tf_flags & IDE_TFLAG_IN_DEVICE)
+        if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)
                 tf->device = superio_ide_inb(io_ports->device_addr);
 
-        if (task->tf_flags & IDE_TFLAG_LBA48) {
+        if (cmd->tf_flags & IDE_TFLAG_LBA48) {
                 outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
 
-                if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
                         tf->hob_feature = inb(io_ports->feature_addr);
-                if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
                         tf->hob_nsect   = inb(io_ports->nsect_addr);
-                if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
                         tf->hob_lbal    = inb(io_ports->lbal_addr);
-                if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
                         tf->hob_lbam    = inb(io_ports->lbam_addr);
-                if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
+                if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
                         tf->hob_lbah    = inb(io_ports->lbah_addr);
         }
 }