commit 5a57ae46dd6f2f1eb377f1bae600ce593b270e5f
author Jaegeuk Kim <jaegeuk@google.com> Wed Mar 18 12:54:40 2020 -0700
committer Jaegeuk Kim <jaegeuk@google.com> Thu Mar 19 15:02:47 2020 +0000
tree 3fbbc1bbe1bf772025a8a2dfa44de0f5734bf4fe
parent 1768e3add76cbe805e24bfab16352dd48db0ac24

scsi: ufs: disable hibern8_on_idle

Let's follow other pixels.

Bug: 151321015
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I5337f0a8a0e75a42cd5d6075d2882cc68f4d0577

drivers/scsi/ufs/ufshcd.c

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index e88f215..69305b3 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -3109,6 +3109,9 @@
 	struct ufs_hba *hba = dev_get_drvdata(dev);
 	u32 value;
 
+	if (!ufshcd_is_hibern8_on_idle_allowed(hba))
+		return count;
+
 	if (kstrtou32(buf, 0, &value))
 		return -EINVAL;
 
@@ -3130,8 +3133,7 @@
 	/* initialize the state variable here */
 	hba->hibern8_on_idle.state = HIBERN8_EXITED;
 
-	if (!ufshcd_is_hibern8_on_idle_allowed(hba) &&
-	    !ufshcd_is_auto_hibern8_supported(hba))
+	if (!ufshcd_is_hibern8_on_idle_allowed(hba))
 		return;
 
 	if (ufshcd_is_auto_hibern8_supported(hba)) {
@@ -3175,8 +3177,7 @@
 
 static void ufshcd_exit_hibern8_on_idle(struct ufs_hba *hba)
 {
-	if (!ufshcd_is_hibern8_on_idle_allowed(hba) &&
-	    !ufshcd_is_auto_hibern8_supported(hba))
+	if (!ufshcd_is_hibern8_on_idle_allowed(hba))
 		return;
 	device_remove_file(hba->dev, &hba->hibern8_on_idle.delay_attr);
 	device_remove_file(hba->dev, &hba->hibern8_on_idle.enable_attr);