scsi: ch: Convert to scsi_execute_cmd()

scsi_execute_req() is going to be removed. Convert ch to
scsi_execute_cmd().

Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 7ab29eaec6f38cd9764dbc2d8ce5fe1e5b979830..72fe6df78bc591b69821ff02cea3dd0907c1f292 100644 (file)
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -184,20 +184,21 @@ static int ch_find_errno(struct scsi_sense_hdr *sshdr)
 
 static int
 ch_do_scsi(scsi_changer *ch, unsigned char *cmd, int cmd_len,
-          void *buffer, unsigned buflength,
-          enum dma_data_direction direction)
+          void *buffer, unsigned int buflength, enum req_op op)
 {
        int errno, retries = 0, timeout, result;
        struct scsi_sense_hdr sshdr;
+       const struct scsi_exec_args exec_args = {
+               .sshdr = &sshdr,
+       };
 
        timeout = (cmd[0] == INITIALIZE_ELEMENT_STATUS)
                ? timeout_init : timeout_move;
 
  retry:
        errno = 0;
-       result = scsi_execute_req(ch->device, cmd, direction, buffer,
-                                 buflength, &sshdr, timeout * HZ,
-                                 MAX_RETRIES, NULL);
+       result = scsi_execute_cmd(ch->device, cmd, op, buffer, buflength,
+                                 timeout * HZ, MAX_RETRIES, &exec_args);
        if (result < 0)
                return result;
        if (scsi_sense_valid(&sshdr)) {
@@ -254,7 +255,7 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
        cmd[5] = 1;
        cmd[9] = 255;
        if (0 == (result = ch_do_scsi(ch, cmd, 12,
-                                     buffer, 256, DMA_FROM_DEVICE))) {
+                                     buffer, 256, REQ_OP_DRV_IN))) {
                if (((buffer[16] << 8) | buffer[17]) != elem) {
                        DPRINTK("asked for element 0x%02x, got 0x%02x\n",
                                elem,(buffer[16] << 8) | buffer[17]);
@@ -284,7 +285,7 @@ ch_init_elem(scsi_changer *ch)
        memset(cmd,0,sizeof(cmd));
        cmd[0] = INITIALIZE_ELEMENT_STATUS;
        cmd[1] = (ch->device->lun & 0x7) << 5;
-       err = ch_do_scsi(ch, cmd, 6, NULL, 0, DMA_NONE);
+       err = ch_do_scsi(ch, cmd, 6, NULL, 0, REQ_OP_DRV_IN);
        VPRINTK(KERN_INFO, "... finished\n");
        return err;
 }
@@ -306,10 +307,10 @@ ch_readconfig(scsi_changer *ch)
        cmd[1] = (ch->device->lun & 0x7) << 5;
        cmd[2] = 0x1d;
        cmd[4] = 255;
-       result = ch_do_scsi(ch, cmd, 10, buffer, 255, DMA_FROM_DEVICE);
+       result = ch_do_scsi(ch, cmd, 10, buffer, 255, REQ_OP_DRV_IN);
        if (0 != result) {
                cmd[1] |= (1<<3);
-               result  = ch_do_scsi(ch, cmd, 10, buffer, 255, DMA_FROM_DEVICE);
+               result  = ch_do_scsi(ch, cmd, 10, buffer, 255, REQ_OP_DRV_IN);
        }
        if (0 == result) {
                ch->firsts[CHET_MT] =
@@ -434,7 +435,7 @@ ch_position(scsi_changer *ch, u_int trans, u_int elem, int rotate)
        cmd[4]  = (elem  >> 8) & 0xff;
        cmd[5]  =  elem        & 0xff;
        cmd[8]  = rotate ? 1 : 0;
-       return ch_do_scsi(ch, cmd, 10, NULL, 0, DMA_NONE);
+       return ch_do_scsi(ch, cmd, 10, NULL, 0, REQ_OP_DRV_IN);
 }
 
 static int
@@ -455,7 +456,7 @@ ch_move(scsi_changer *ch, u_int trans, u_int src, u_int dest, int rotate)
        cmd[6]  = (dest  >> 8) & 0xff;
        cmd[7]  =  dest        & 0xff;
        cmd[10] = rotate ? 1 : 0;
-       return ch_do_scsi(ch, cmd, 12, NULL,0, DMA_NONE);
+       return ch_do_scsi(ch, cmd, 12, NULL, 0, REQ_OP_DRV_IN);
 }
 
 static int
@@ -481,7 +482,7 @@ ch_exchange(scsi_changer *ch, u_int trans, u_int src,
        cmd[9]  =  dest2       & 0xff;
        cmd[10] = (rotate1 ? 1 : 0) | (rotate2 ? 2 : 0);
 
-       return ch_do_scsi(ch, cmd, 12, NULL, 0, DMA_NONE);
+       return ch_do_scsi(ch, cmd, 12, NULL, 0, REQ_OP_DRV_IN);
 }
 
 static void
@@ -531,7 +532,7 @@ ch_set_voltag(scsi_changer *ch, u_int elem,
        memcpy(buffer,tag,32);
        ch_check_voltag(buffer);
 
-       result = ch_do_scsi(ch, cmd, 12, buffer, 256, DMA_TO_DEVICE);
+       result = ch_do_scsi(ch, cmd, 12, buffer, 256, REQ_OP_DRV_OUT);
        kfree(buffer);
        return result;
 }
@@ -799,8 +800,7 @@ static long ch_ioctl(struct file *file,
                ch_cmd[5] = 1;
                ch_cmd[9] = 255;
 
-               result = ch_do_scsi(ch, ch_cmd, 12,
-                                   buffer, 256, DMA_FROM_DEVICE);
+               result = ch_do_scsi(ch, ch_cmd, 12, buffer, 256, REQ_OP_DRV_IN);
                if (!result) {
                        cge.cge_status = buffer[18];
                        cge.cge_flags = 0;