[PATCH 4/6] qla2xxx: Move the sp->ref_count initialization into qla2xxx_get_qpair_sp()

[Bart Van Assche]

Instead of making all qla2xxx_get_qpair_sp() callers initialize
sp->ref_count, move the initialization of that variable into
qla2xxx_get_qpair_sp(). This patch does not change any functionality.

Cc: Himanshu Madhani <hmadh...@marvell.com>
Cc: Giridhar Malavali <gmalav...@marvell.com>
Signed-off-by: Bart Van Assche <bvanass...@acm.org>
---
 drivers/scsi/qla2xxx/qla_inline.h | 1 +
 drivers/scsi/qla2xxx/qla_nvme.c   | 2 --
 drivers/scsi/qla2xxx/qla_os.c     | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_inline.h 
b/drivers/scsi/qla2xxx/qla_inline.h
index bf063c664352..2523fbc6c666 100644
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -168,6 +168,7 @@ qla2xxx_get_qpair_sp(scsi_qla_host_t *vha, struct qla_qpair 
*qpair,
                goto done;
 
        memset(sp, 0, sizeof(*sp));
+       atomic_set(&sp->ref_count, 1);
        sp->fcport = fcport;
        sp->iocbs = 1;
        sp->vha = vha;
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
index 01f1c2e6180f..fc0c57ecab25 100644
--- a/drivers/scsi/qla2xxx/qla_nvme.c
+++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -248,7 +248,6 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport,
        sp->type = SRB_NVME_LS;
        sp->name = "nvme_ls";
        sp->done = qla_nvme_sp_ls_done;
-       atomic_set(&sp->ref_count, 1);
        nvme = &sp->u.iocb_cmd;
        priv->sp = sp;
        priv->fd = fd;
@@ -505,7 +504,6 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port 
*lport,
        if (!sp)
                return -EBUSY;
 
-       atomic_set(&sp->ref_count, 1);
        init_waitqueue_head(&sp->nvme_ls_waitq);
        priv->sp = sp;
        sp->type = SRB_NVME_CMD;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 7768b8462942..7b9f138ad9e4 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -923,7 +923,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct 
scsi_cmnd *cmd)
 
        sp->u.scmd.cmd = cmd;
        sp->type = SRB_SCSI_CMD;
-       atomic_set(&sp->ref_count, 1);
        CMD_SP(cmd) = (void *)sp;
        sp->free = qla2x00_sp_free_dma;
        sp->done = qla2x00_sp_compl;
@@ -1009,7 +1008,6 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct 
scsi_cmnd *cmd,
 
        sp->u.scmd.cmd = cmd;
        sp->type = SRB_SCSI_CMD;
-       atomic_set(&sp->ref_count, 1);
        CMD_SP(cmd) = (void *)sp;
        sp->free = qla2xxx_qpair_sp_free_dma;
        sp->done = qla2xxx_qpair_sp_compl;
-- 
2.22.0.rc3