ide: pass command instead of request to ide_pio_datablock()

* Add IDE_TFLAG_FS taskfile flag and set it for REQ_TYPE_FS requests.

* Convert ->{in,out}put_data methods to take command instead of request
  as an argument.  Then convert pre_task_out_intr(), task_end_request(),
  task_error(), task_in_unexpected(), ide_pio_sector(), ide_pio_multi()
  and ide_pio_datablock() in similar way.

* Rename task_end_request() to ide_finish_cmd().

There should be no functional changes caused by this patch.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index 6085feb1fae8..b368a5effc3a 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -62,23 +62,23 @@ static void falconide_get_lock(irq_handler_t handler, void *data)
         }
 }
 
-static void falconide_input_data(ide_drive_t *drive, struct request *rq,
+static void falconide_input_data(ide_drive_t *drive, struct ide_cmd *cmd,
                                  void *buf, unsigned int len)
 {
         unsigned long data_addr = drive->hwif->io_ports.data_addr;
 
-        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+        if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS))
                 return insw(data_addr, buf, (len + 1) / 2);
 
         raw_insw_swapw((u16 *)data_addr, buf, (len + 1) / 2);
 }
 
-static void falconide_output_data(ide_drive_t *drive, struct request *rq,
+static void falconide_output_data(ide_drive_t *drive, struct ide_cmd *cmd,
                                   void *buf, unsigned int len)
 {
         unsigned long data_addr = drive->hwif->io_ports.data_addr;
 
-        if (drive->media == ide_disk && rq && rq->cmd_type == REQ_TYPE_FS)
+        if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS))
                 return outsw(data_addr, buf, (len + 1) / 2);
 
         raw_outsw_swapw((u16 *)data_addr, buf, (len + 1) / 2);