scsi: qla2xxx: Simplify qlt_send_term_imm_notif()
authorBart Van Assche <bvanassche@acm.org>
Wed, 17 Apr 2019 21:44:26 +0000 (14:44 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 29 Apr 2019 21:24:50 +0000 (17:24 -0400)
All qlt_send_term_imm_notif() callers pass '1' as second argument to this
function. Hence remove the (broken) code that depends on that second
argument having another value. Add a pr_debug() statement that prints rc to
avoid that the compiler would complain that rc has been set but is not
used.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_target.c

index bf5b800..08f22ed 100644 (file)
@@ -3651,33 +3651,11 @@ static int __qlt_send_term_imm_notif(struct scsi_qla_host *vha,
 static void qlt_send_term_imm_notif(struct scsi_qla_host *vha,
        struct imm_ntfy_from_isp *imm, int ha_locked)
 {
-       unsigned long flags = 0;
        int rc;
 
-       if (ha_locked) {
-               rc = __qlt_send_term_imm_notif(vha, imm);
-
-#if 0  /* Todo  */
-               if (rc == -ENOMEM)
-                       qlt_alloc_qfull_cmd(vha, imm, 0, 0);
-#else
-               if (rc) {
-               }
-#endif
-               goto done;
-       }
-
-       spin_lock_irqsave(&vha->hw->hardware_lock, flags);
+       WARN_ON_ONCE(!ha_locked);
        rc = __qlt_send_term_imm_notif(vha, imm);
-
-#if 0  /* Todo */
-       if (rc == -ENOMEM)
-               qlt_alloc_qfull_cmd(vha, imm, 0, 0);
-#endif
-
-done:
-       if (!ha_locked)
-               spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);
+       pr_debug("rc = %d\n", rc);
 }
 
 /*