1 files changed, 23 insertions, 15 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index ab545ffa1549..cf55a48a7dd2 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -109,13 +109,15 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
 
         if ((task->tf_flags & IDE_TFLAG_DMA_PIO_FALLBACK) == 0) {
                 ide_tf_dump(drive->name, tf);
+                ide_set_irq(drive, 1);
+                SELECT_MASK(drive, 0);
                 hwif->tf_load(drive, task);
         }
 
         switch (task->data_phase) {
         case TASKFILE_MULTI_OUT:
         case TASKFILE_OUT:
-                hwif->OUTBSYNC(drive, tf->command, hwif->io_ports.command_addr);
+                hwif->OUTBSYNC(hwif, tf->command, hwif->io_ports.command_addr);
                 ndelay(400);    /* FIXME */
                 return pre_task_out_intr(drive, task->rq);
         case TASKFILE_MULTI_IN:
@@ -492,11 +494,12 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq)
 
 int ide_raw_taskfile(ide_drive_t *drive, ide_task_t *task, u8 *buf, u16 nsect)
 {
-        struct request rq;
+        struct request *rq;
+        int error;
 
-        blk_rq_init(NULL, &rq);
-        rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
-        rq.buffer = buf;
+        rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
+        rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
+        rq->buffer = buf;
 
         /*
          * (ks) We transfer currently only whole sectors.
@@ -504,16 +507,19 @@ int ide_raw_taskfile(ide_drive_t *drive, ide_task_t *task, u8 *buf, u16 nsect)
          * if we would find a solution to transfer any size.
          * To support special commands like READ LONG.
          */
-        rq.hard_nr_sectors = rq.nr_sectors = nsect;
-        rq.hard_cur_sectors = rq.current_nr_sectors = nsect;
+        rq->hard_nr_sectors = rq->nr_sectors = nsect;
+        rq->hard_cur_sectors = rq->current_nr_sectors = nsect;
 
         if (task->tf_flags & IDE_TFLAG_WRITE)
-                rq.cmd_flags |= REQ_RW;
+                rq->cmd_flags |= REQ_RW;
 
-        rq.special = task;
-        task->rq = &rq;
+        rq->special = task;
+        task->rq = rq;
 
-        return ide_do_drive_cmd(drive, &rq, ide_wait);
+        error = blk_execute_rq(drive->queue, NULL, rq, 0);
+        blk_put_request(rq);
+
+        return error;
 }
 
 EXPORT_SYMBOL(ide_raw_taskfile);
@@ -739,12 +745,14 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
         struct hd_driveid *id = drive->id;
 
         if (NULL == (void *) arg) {
-                struct request rq;
+                struct request *rq;
 
-                ide_init_drive_cmd(&rq);
-                rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
+                rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
+                rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
+                err = blk_execute_rq(drive->queue, NULL, rq, 0);
+                blk_put_request(rq);
 
-                return ide_do_drive_cmd(drive, &rq, ide_wait);
+                return err;
         }
 
         if (copy_from_user(args, (void __user *)arg, 4))