Merge "scsi: ufs: reomove Rst_N pulling up action in ufshcd_resume()" (14919b3d) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/ufs/ufshcd.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -10540,13 +10540,6 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
		/* enable the host irq as host controller would be active soon */
		ufshcd_enable_irq(hba);

		/* Pull up RST_n before device reset */
		if (ufshcd_is_link_off(hba)) {
		ret = ufshcd_deassert_device_reset(hba);
		if (ret)
		goto disable_irq_and_vops_clks;
		}

		/*
		* Call vendor specific resume callback. As these callbacks may access
		* vendor specific host controller register space call them when the
		@@ -10554,7 +10547,7 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
		*/
		ret = ufshcd_vops_resume(hba, pm_op);
		if (ret)
		goto assert_device_reset;
		goto disable_irq_and_vops_clks;

		if (ufshcd_is_link_hibern8(hba)) {
		ret = ufshcd_uic_hibern8_exit(hba);
		@@ -10645,9 +10638,6 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
		hba->hibern8_on_idle.state = HIBERN8_ENTERED;
		vendor_suspend:
		ufshcd_vops_suspend(hba, pm_op);
		assert_device_reset:
		if (ufshcd_is_link_off(hba))
		ufshcd_assert_device_reset(hba);
		disable_irq_and_vops_clks:
		ufshcd_disable_irq(hba);
		if (hba->clk_scaling.is_allowed)