block: fold cmd_type into the REQ_OP_ space

[mirror_ubuntu-bionic-kernel.git] / drivers / ide / ide-devsets.c

diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 0dd43b4fcec6353633d12338be557b8e1e13ef14..a45dda5386e4403206ee73a18b8bb8b16b012e65 100644 (file)
--- a/drivers/ide/ide-devsets.c
+++ b/drivers/ide/ide-devsets.c
@@ -165,11 +165,12 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting,
        if (!(setting->flags & DS_SYNC))
                return setting->set(drive, arg);
 
-       rq = blk_get_request(q, READ, __GFP_RECLAIM);
-       rq->cmd_type = REQ_TYPE_DRV_PRIV;
-       rq->cmd_len = 5;
-       rq->cmd[0] = REQ_DEVSET_EXEC;
-       *(int *)&rq->cmd[1] = arg;
+       rq = blk_get_request(q, REQ_OP_DRV_IN, __GFP_RECLAIM);
+       scsi_req_init(rq);
+       ide_req(rq)->type = ATA_PRIV_MISC;
+       scsi_req(rq)->cmd_len = 5;
+       scsi_req(rq)->cmd[0] = REQ_DEVSET_EXEC;
+       *(int *)&scsi_req(rq)->cmd[1] = arg;
        rq->special = setting->set;
 
        if (blk_execute_rq(q, NULL, rq, 0))
@@ -183,7 +184,7 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq)
 {
        int err, (*setfunc)(ide_drive_t *, int) = rq->special;
 
-       err = setfunc(drive, *(int *)&rq->cmd[1]);
+       err = setfunc(drive, *(int *)&scsi_req(rq)->cmd[1]);
        if (err)
                rq->errors = err;
        ide_complete_rq(drive, err, blk_rq_bytes(rq));