diff mbox series

[48/59] qla2xxx: Rename qla24xx_async_abort_command() into qla24xx_sync_abort_command()

Message ID 20190801175614.73655-49-bvanassche@acm.org (mailing list archive)
State Superseded
Headers show
Series qla2xxx patches for kernel v5.4 | expand

Commit Message

Bart Van Assche Aug. 1, 2019, 5:56 p.m. UTC 
Since this function waits until aborting completed, change the function
name to make clear that this is a synchronous function.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/qla2xxx/qla_gbl.h  | 2 +-
 drivers/scsi/qla2xxx/qla_init.c | 6 +++++-
 drivers/scsi/qla2xxx/qla_mbx.c  | 2 +-
 drivers/scsi/qla2xxx/qla_os.c   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index bbfbe3a34a7e..047d92a01d4a 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -400,7 +400,7 @@  qla24xx_get_isp_stats(scsi_qla_host_t *, struct link_statistics *,
     dma_addr_t, uint16_t);
 
 extern int qla24xx_abort_command(srb_t *);
-extern int qla24xx_async_abort_command(srb_t *);
+extern int qla24xx_sync_abort_command(srb_t *);
 extern int
 qla24xx_abort_target(struct fc_port *, uint64_t, int);
 extern int
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 3fa8ca63429c..835ca1b147cf 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1857,8 +1857,12 @@  qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,
 	return rval;
 }
 
+/**
+ * qla24xx_sync_abort_command - abort an SRB and wait until it has been aborted
+ * @sp: SRB to abort.
+ */
 int
-qla24xx_async_abort_command(srb_t *sp)
+qla24xx_sync_abort_command(srb_t *sp)
 {
 	unsigned long   flags = 0;
 
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index a82b6db2fa9d..65c33f4c5a89 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3134,7 +3134,7 @@  qla24xx_abort_command(srb_t *sp)
 		return QLA_FUNCTION_FAILED;
 
 	if (ql2xasynctmfenable)
-		return qla24xx_async_abort_command(sp);
+		return qla24xx_sync_abort_command(sp);
 
 	spin_lock_irqsave(qpair->qp_lock_ptr, flags);
 	for (handle = 1; handle < req->num_outstanding_cmds; handle++) {
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 835572d7d71a..05e63bde22e3 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2431,7 +2431,7 @@  static struct isp_operations qlafx00_isp_ops = {
 	.intr_handler		= qlafx00_intr_handler,
 	.enable_intrs		= qlafx00_enable_intrs,
 	.disable_intrs		= qlafx00_disable_intrs,
-	.abort_command		= qla24xx_async_abort_command,
+	.abort_command		= qla24xx_sync_abort_command,
 	.target_reset		= qlafx00_abort_target,
 	.lun_reset		= qlafx00_lun_reset,
 	.fabric_login		= NULL,