scsi: target: target_core_pscsi: Convert to scsi_execute_cmd()

scsi_execute_req() is going to be removed. Convert pscsi 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/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 69a4c95..e742554 100644 (file)
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -144,8 +144,7 @@ static void pscsi_tape_read_blocksize(struct se_device *dev,
        cdb[0] = MODE_SENSE;
        cdb[4] = 0x0c; /* 12 bytes */
 
-       ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf, 12, NULL,
-                       HZ, 1, NULL);
+       ret = scsi_execute_cmd(sdev, cdb, REQ_OP_DRV_IN, buf, 12, HZ, 1, NULL);
        if (ret)
                goto out_free;
 
@@ -195,8 +194,8 @@ pscsi_get_inquiry_vpd_serial(struct scsi_device *sdev, struct t10_wwn *wwn)
        cdb[2] = 0x80; /* Unit Serial Number */
        put_unaligned_be16(INQUIRY_VPD_SERIAL_LEN, &cdb[3]);
 
-       ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf,
-                             INQUIRY_VPD_SERIAL_LEN, NULL, HZ, 1, NULL);
+       ret = scsi_execute_cmd(sdev, cdb, REQ_OP_DRV_IN, buf,
+                              INQUIRY_VPD_SERIAL_LEN, HZ, 1, NULL);
        if (ret)
                goto out_free;
 
@@ -230,9 +229,8 @@ pscsi_get_inquiry_vpd_device_ident(struct scsi_device *sdev,
        cdb[2] = 0x83; /* Device Identifier */
        put_unaligned_be16(INQUIRY_VPD_DEVICE_IDENTIFIER_LEN, &cdb[3]);
 
-       ret = scsi_execute_req(sdev, cdb, DMA_FROM_DEVICE, buf,
-                             INQUIRY_VPD_DEVICE_IDENTIFIER_LEN,
-                             NULL, HZ, 1, NULL);
+       ret = scsi_execute_cmd(sdev, cdb, REQ_OP_DRV_IN, buf,
+                              INQUIRY_VPD_DEVICE_IDENTIFIER_LEN, HZ, 1, NULL);
        if (ret)
                goto out;