ide: remove ide_task_t typedef

While at it:
- rename struct ide_task_s to struct ide_cmd
- remove stale comments from idedisk_{read_native,set}_max_address()
- drop unused 'cmd' argument from ide_{cmd,task}_ioctl()
- drop unused 'task' argument from tx4939ide_tf_load_fixup()
- rename ide_complete_task() to ide_complete_cmd()
- use consistent naming for struct ide_cmd variables

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 317c5dadd7c0..c3023de7270c 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -31,15 +31,15 @@ void SELECT_DRIVE(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
         const struct ide_port_ops *port_ops = hwif->port_ops;
-        ide_task_t task;
+        struct ide_cmd cmd;
 
         if (port_ops && port_ops->selectproc)
                 port_ops->selectproc(drive);
 
-        memset(&task, 0, sizeof(task));
-        task.tf_flags = IDE_TFLAG_OUT_DEVICE;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.tf_flags = IDE_TFLAG_OUT_DEVICE;
 
-        drive->hwif->tp_ops->tf_load(drive, &task);
+        drive->hwif->tp_ops->tf_load(drive, &cmd);
 }
 
 void SELECT_MASK(ide_drive_t *drive, int mask)
@@ -52,14 +52,14 @@ void SELECT_MASK(ide_drive_t *drive, int mask)
 
 u8 ide_read_error(ide_drive_t *drive)
 {
-        ide_task_t task;
+        struct ide_cmd cmd;
 
-        memset(&task, 0, sizeof(task));
-        task.tf_flags = IDE_TFLAG_IN_FEATURE;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.tf_flags = IDE_TFLAG_IN_FEATURE;
 
-        drive->hwif->tp_ops->tf_read(drive, &task);
+        drive->hwif->tp_ops->tf_read(drive, &cmd);
 
-        return task.tf.error;
+        return cmd.tf.error;
 }
 EXPORT_SYMBOL_GPL(ide_read_error);
 
@@ -329,7 +329,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         u16 *id = drive->id, i;
         int error = 0;
         u8 stat;
-        ide_task_t task;
+        struct ide_cmd cmd;
 
 #ifdef CONFIG_BLK_DEV_IDEDMA
         if (hwif->dma_ops)      /* check if host supports DMA */
@@ -361,12 +361,12 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
         udelay(1);
         tp_ops->set_irq(hwif, 0);
 
-        memset(&task, 0, sizeof(task));
-        task.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT;
-        task.tf.feature = SETFEATURES_XFER;
-        task.tf.nsect   = speed;
+        memset(&cmd, 0, sizeof(cmd));
+        cmd.tf_flags = IDE_TFLAG_OUT_FEATURE | IDE_TFLAG_OUT_NSECT;
+        cmd.tf.feature = SETFEATURES_XFER;
+        cmd.tf.nsect   = speed;
 
-        tp_ops->tf_load(drive, &task);
+        tp_ops->tf_load(drive, &cmd);
 
         tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES);