ide: convert to blk-mq

[linux-2.6-microblaze.git] / drivers / ide / ide-disk.c

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index e3b4e65..f8567c8 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -427,9 +427,8 @@ static void ide_disk_unlock_native_capacity(ide_drive_t *drive)
                drive->dev_flags |= IDE_DFLAG_NOHPA; /* disable HPA on resume */
 }
 
-static int idedisk_prep_fn(struct request_queue *q, struct request *rq)
+static int idedisk_prep_fn(ide_drive_t *drive, struct request *rq)
 {
-       ide_drive_t *drive = q->queuedata;
        struct ide_cmd *cmd;
 
        if (req_op(rq) != REQ_OP_FLUSH)
@@ -548,7 +547,7 @@ static void update_flush(ide_drive_t *drive)
 
                if (barrier) {
                        wc = true;
-                       blk_queue_prep_rq(drive->queue, idedisk_prep_fn);
+                       drive->prep_rq = idedisk_prep_fn;
                }
        }