scsi: ufs: core: Simplify ufshcd_mcq_sq_cleanup() using guard()

Simplify ufshcd_mcq_sq_cleanup() by using guard(mutex)() instead of
explicit mutex_lock() and mutex_unlock() calls. No functionality has
been changed.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Link: https://patch.msgid.link/20251014200118.3390839-9-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index c9bdd4140fd04bbdef616d7c047822583dad34bb..d04662b57cd19bbdca96bccfdec4d5aa27e2cf0e 100644 (file)
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -568,12 +568,12 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
 
        id = hwq->id;
 
-       mutex_lock(&hwq->sq_mutex);
+       guard(mutex)(&hwq->sq_mutex);
 
        /* stop the SQ fetching before working on it */
        err = ufshcd_mcq_sq_stop(hba, hwq);
        if (err)
-               goto unlock;
+               return err;
 
        /* SQCTI = EXT_IID, IID, LUN, Task Tag */
        nexus = lrbp->lun << 8 | task_tag;
@@ -600,8 +600,6 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
        if (ufshcd_mcq_sq_start(hba, hwq))
                err = -ETIMEDOUT;
 
-unlock:
-       mutex_unlock(&hwq->sq_mutex);
        return err;
 }