scsi: ufs: core: Refactor ufshcd_hba_enable()
authorKeoseong Park <keosung.park@samsung.com>
Fri, 28 Oct 2022 07:35:53 +0000 (16:35 +0900)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 8 Nov 2022 02:55:31 +0000 (02:55 +0000)
Use "if error return" style in ufshcd_hba_enable().  No functional change.

Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Keoseong Park <keosung.park@samsung.com>
Link: https://lore.kernel.org/r/20221028073553epcms2p6dc4f8bdbebdc8f96f43fc4197b3edd0c@epcms2p6
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufshcd.c

index ee73d70..0591d05 100644 (file)
@@ -4668,14 +4668,18 @@ int ufshcd_hba_enable(struct ufs_hba *hba)
                /* enable UIC related interrupts */
                ufshcd_enable_intr(hba, UFSHCD_UIC_MASK);
                ret = ufshcd_dme_reset(hba);
-               if (!ret) {
-                       ret = ufshcd_dme_enable(hba);
-                       if (!ret)
-                               ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
-                       if (ret)
-                               dev_err(hba->dev,
-                                       "Host controller enable failed with non-hce\n");
+               if (ret) {
+                       dev_err(hba->dev, "DME_RESET failed\n");
+                       return ret;
                }
+
+               ret = ufshcd_dme_enable(hba);
+               if (ret) {
+                       dev_err(hba->dev, "Enabling DME failed\n");
+                       return ret;
+               }
+
+               ufshcd_vops_hce_enable_notify(hba, POST_CHANGE);
        } else {
                ret = ufshcd_hba_execute_hce(hba);
        }