Merge "Revert "scsi: ufs: Recheck bkops level if bkops is disabled"" (5edc4e08) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/ufs/ufshcd.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -6797,7 +6797,6 @@ static int ufshcd_disable_auto_bkops(struct ufs_hba *hba)

		hba->auto_bkops_enabled = false;
		trace_ufshcd_auto_bkops_state(dev_name(hba->dev), 0);
		hba->is_urgent_bkops_lvl_checked = false;
		out:
		return err;
		}
		@@ -6822,7 +6821,6 @@ static void ufshcd_force_reset_auto_bkops(struct ufs_hba *hba)
		hba->ee_ctrl_mask &= ~MASK_EE_URGENT_BKOPS;
		ufshcd_disable_auto_bkops(hba);
		}
		hba->is_urgent_bkops_lvl_checked = false;
		}

		static inline int ufshcd_get_bkops_status(struct ufs_hba hba, u32 status)
		@@ -6869,7 +6867,6 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
		err = ufshcd_enable_auto_bkops(hba);
		else
		err = ufshcd_disable_auto_bkops(hba);
		hba->urgent_bkops_lvl = curr_status;
		out:
		return err;
		}