diff options
author | Christoph Hellwig | 2017-02-23 16:02:37 +0100 |
---|---|---|
committer | Martin K. Petersen | 2017-02-23 22:57:36 +0100 |
commit | fcbfffe2c5cbec0c1721b2261c316b961ad50208 (patch) | |
tree | 611761e2e75cae43e41f0b5d00f5f3d1c50ad5a1 /drivers/scsi/device_handler/scsi_dh_hp_sw.c | |
parent | scsi: merge __scsi_execute into scsi_execute (diff) | |
download | kernel-qcow2-linux-fcbfffe2c5cbec0c1721b2261c316b961ad50208.tar.gz kernel-qcow2-linux-fcbfffe2c5cbec0c1721b2261c316b961ad50208.tar.xz kernel-qcow2-linux-fcbfffe2c5cbec0c1721b2261c316b961ad50208.zip |
scsi: remove scsi_execute_req_flags
And switch all callers to use scsi_execute instead.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/device_handler/scsi_dh_hp_sw.c')
-rw-r--r-- | drivers/scsi/device_handler/scsi_dh_hp_sw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c index be43c940636d..62d314e07d11 100644 --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c @@ -100,9 +100,8 @@ static int hp_sw_tur(struct scsi_device *sdev, struct hp_sw_dh_data *h) REQ_FAILFAST_DRIVER; retry: - res = scsi_execute_req_flags(sdev, cmd, DMA_NONE, NULL, 0, &sshdr, - HP_SW_TIMEOUT, HP_SW_RETRIES, - NULL, req_flags, 0); + res = scsi_execute(sdev, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, + HP_SW_TIMEOUT, HP_SW_RETRIES, req_flags, 0, NULL); if (res) { if (scsi_sense_valid(&sshdr)) ret = tur_done(sdev, h, &sshdr); @@ -139,9 +138,8 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h) REQ_FAILFAST_DRIVER; retry: - res = scsi_execute_req_flags(sdev, cmd, DMA_NONE, NULL, 0, &sshdr, - HP_SW_TIMEOUT, HP_SW_RETRIES, - NULL, req_flags, 0); + res = scsi_execute(sdev, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, + HP_SW_TIMEOUT, HP_SW_RETRIES, req_flags, 0, NULL); if (res) { if (!scsi_sense_valid(&sshdr)) { sdev_printk(KERN_WARNING, sdev, |