scsi: qla2xxx: Don't check for fw_started while posting NVMe command
authorSaurav Kashyap <skashyap@marvell.com>
Wed, 2 Dec 2020 13:23:02 +0000 (05:23 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 9 Dec 2020 16:34:17 +0000 (11:34 -0500)
NVMe commands can come only after successful addition of rport and NVMe
connect, and rport is only registered after FW started bit is set. Remove
the redundant check.

Link: https://lore.kernel.org/r/20201202132312.19966-6-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_nvme.c

index b7a1dc24db3806fb5c51e38f5fd17b9e0fdff926..d4159d5a4ffd68062910e8eb47103862897dde50 100644 (file)
@@ -554,19 +554,15 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,
 
        fcport = qla_rport->fcport;
 
-       if (!qpair || !fcport)
-               return -ENODEV;
-
-       if (!qpair->fw_started || fcport->deleted)
+       if (unlikely(!qpair || !fcport || fcport->deleted))
                return -EBUSY;
 
-       vha = fcport->vha;
-
        if (!(fcport->nvme_flag & NVME_FLAG_REGISTERED))
                return -ENODEV;
 
-       if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) ||
-           (qpair && !qpair->fw_started) || fcport->deleted)
+       vha = fcport->vha;
+
+       if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
                return -EBUSY;
 
        /*