scsi: ufs: core: Make ufshcd_uic_cmd_compl() easier to read

Introduce a local variable for the expression hba->active_uic_cmd.
Remove superfluous parentheses. No functionality has been changed.

Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240912223019.3510966-3-bvanassche@acm.org
Reviewed-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
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 24a32e2fd75e4b4efffbc32e3e28cf7bab6996b7..8212e2d14256b7eb0fd24a8b2d43e017839889f2 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -5477,31 +5477,30 @@ static bool ufshcd_is_auto_hibern8_error(struct ufs_hba *hba,
 static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status)
 {
        irqreturn_t retval = IRQ_NONE;
+       struct uic_command *cmd;
 
        spin_lock(hba->host->host_lock);
+       cmd = hba->active_uic_cmd;
        if (ufshcd_is_auto_hibern8_error(hba, intr_status))
                hba->errors |= (UFSHCD_UIC_HIBERN8_MASK & intr_status);
 
-       if ((intr_status & UIC_COMMAND_COMPL) && hba->active_uic_cmd) {
-               hba->active_uic_cmd->argument2 |=
-                       ufshcd_get_uic_cmd_result(hba);
-               hba->active_uic_cmd->argument3 =
-                       ufshcd_get_dme_attr_val(hba);
+       if (intr_status & UIC_COMMAND_COMPL && cmd) {
+               cmd->argument2 |= ufshcd_get_uic_cmd_result(hba);
+               cmd->argument3 = ufshcd_get_dme_attr_val(hba);
                if (!hba->uic_async_done)
-                       hba->active_uic_cmd->cmd_active = 0;
-               complete(&hba->active_uic_cmd->done);
+                       cmd->cmd_active = 0;
+               complete(&cmd->done);
                retval = IRQ_HANDLED;
        }
 
-       if ((intr_status & UFSHCD_UIC_PWR_MASK) && hba->uic_async_done) {
-               hba->active_uic_cmd->cmd_active = 0;
+       if (intr_status & UFSHCD_UIC_PWR_MASK && hba->uic_async_done) {
+               cmd->cmd_active = 0;
                complete(hba->uic_async_done);
                retval = IRQ_HANDLED;
        }
 
        if (retval == IRQ_HANDLED)
-               ufshcd_add_uic_command_trace(hba, hba->active_uic_cmd,
-                                            UFS_CMD_COMP);
+               ufshcd_add_uic_command_trace(hba, cmd, UFS_CMD_COMP);
        spin_unlock(hba->host->host_lock);
        return retval;
 }