scsi: ses: Convert to scsi_execute_cmd()

scsi_execute_req() is going to be removed. Convert ses 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/ses.c b/drivers/scsi/ses.c
index 0a1734f34587dd4dc9e8b78468b05d37336e86b5..869ca9c7f23f731377e38beb21e930fe2cac92ea 100644 (file)
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -89,10 +89,13 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code,
        unsigned char recv_page_code;
        unsigned int retries = SES_RETRIES;
        struct scsi_sense_hdr sshdr;
+       const struct scsi_exec_args exec_args = {
+               .sshdr = &sshdr,
+       };
 
        do {
-               ret = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen,
-                                      &sshdr, SES_TIMEOUT, 1, NULL);
+               ret = scsi_execute_cmd(sdev, cmd, REQ_OP_DRV_IN, buf, bufflen,
+                                      SES_TIMEOUT, 1, &exec_args);
        } while (ret > 0 && --retries && scsi_sense_valid(&sshdr) &&
                 (sshdr.sense_key == NOT_READY ||
                  (sshdr.sense_key == UNIT_ATTENTION && sshdr.asc == 0x29)));
@@ -130,10 +133,13 @@ static int ses_send_diag(struct scsi_device *sdev, int page_code,
        };
        struct scsi_sense_hdr sshdr;
        unsigned int retries = SES_RETRIES;
+       const struct scsi_exec_args exec_args = {
+               .sshdr = &sshdr,
+       };
 
        do {
-               result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, buf, bufflen,
-                                         &sshdr, SES_TIMEOUT, 1, NULL);
+               result = scsi_execute_cmd(sdev, cmd, REQ_OP_DRV_OUT, buf,
+                                         bufflen, SES_TIMEOUT, 1, &exec_args);
        } while (result > 0 && --retries && scsi_sense_valid(&sshdr) &&
                 (sshdr.sense_key == NOT_READY ||
                  (sshdr.sense_key == UNIT_ATTENTION && sshdr.asc == 0x29)));