scsi: ufs: Remove a local variable from ufshcd_abort_all()

No functionality is changed. This patch prepares for unifying the MCQ and
legacy code paths in this function.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230727194457.3152309-9-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 19c210ef74f5706b7d5c231dba3dc04dff126a9e..c0031cf8855c44b40f9457dd9e43895409ec8928 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -6387,9 +6387,14 @@ static bool ufshcd_is_pwr_mode_restore_needed(struct ufs_hba *hba)
        return false;
 }
 
+/**
+ * ufshcd_abort_all - Abort all pending commands.
+ * @hba: Host bus adapter pointer.
+ *
+ * Return: true if and only if the host controller needs to be reset.
+ */
 static bool ufshcd_abort_all(struct ufs_hba *hba)
 {
-       bool needs_reset = false;
        int tag, ret;
 
        if (is_mcq_enabled(hba)) {
@@ -6404,10 +6409,8 @@ static bool ufshcd_abort_all(struct ufs_hba *hba)
                        dev_err(hba->dev, "Aborting tag %d / CDB %#02x %s\n", tag,
                                hba->lrb[tag].cmd ? hba->lrb[tag].cmd->cmnd[0] : -1,
                                ret ? "failed" : "succeeded");
-                       if (ret) {
-                               needs_reset = true;
+                       if (ret)
                                goto out;
-                       }
                }
        } else {
                /* Clear pending transfer requests */
@@ -6416,25 +6419,22 @@ static bool ufshcd_abort_all(struct ufs_hba *hba)
                        dev_err(hba->dev, "Aborting tag %d / CDB %#02x %s\n", tag,
                                hba->lrb[tag].cmd ? hba->lrb[tag].cmd->cmnd[0] : -1,
                                ret ? "failed" : "succeeded");
-                       if (ret) {
-                               needs_reset = true;
+                       if (ret)
                                goto out;
-                       }
                }
        }
        /* Clear pending task management requests */
        for_each_set_bit(tag, &hba->outstanding_tasks, hba->nutmrs) {
-               if (ufshcd_clear_tm_cmd(hba, tag)) {
-                       needs_reset = true;
+               ret = ufshcd_clear_tm_cmd(hba, tag);
+               if (ret)
                        goto out;
-               }
        }
 
 out:
        /* Complete the requests that are cleared by s/w */
        ufshcd_complete_requests(hba, false);
 
-       return needs_reset;
+       return ret != 0;
 }
 
 /**