Revert "scsi: ufs: fix a missing check of devm_reset_control_get"

commit 4d427b408c4c2ff1676966c72119a3a559f8e39b upstream.

This reverts commit 63a06181d7ce169d09843645c50fea1901bc9f0a.

Because of recent interactions with developers from @umn.edu, all
commits from them have been recently re-reviewed to ensure if they were
correct or not.

Upon review, this commit was found to be incorrect for the reasons
below, so it must be reverted.  It will be fixed up "correctly" in a
later kernel change.

The original commit is incorrect, it does not properly clean up on the
error path, so I'll keep the revert and fix it up properly with a
follow-on patch.

Cc: Kangjie Lu <kjlu@umn.edu>
Cc: Avri Altman <avri.altman@wdc.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Fixes: 63a06181d7ce ("scsi: ufs: fix a missing check of devm_reset_control_get")
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210503115736.2104747-31-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c
index 6bbb1679bb91c0344c180905ee6281652be3f7f3..b3235b3568d228fe2b9ccc80249ad9e11504a53a 100644 (file)
--- a/drivers/scsi/ufs/ufs-hisi.c
+++ b/drivers/scsi/ufs/ufs-hisi.c
@@ -482,10 +482,6 @@ static int ufs_hisi_init_common(struct ufs_hba *hba)
        ufshcd_set_variant(hba, host);
 
        host->rst  = devm_reset_control_get(dev, "rst");
-       if (IS_ERR(host->rst)) {
-               dev_err(dev, "%s: failed to get reset control\n", __func__);
-               return PTR_ERR(host->rst);
-       }
 
        ufs_hisi_set_pm_lvl(hba);