From b3d28c180f2a6af60de9fcd8604c2b55536f225c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 13 Jul 2025 13:46:16 +0000 Subject: [PATCH] Revert "scsi: ufs: core: Fix clk scaling to be conditional in reset and restore" This reverts commit 51ba65860457b67e7905fe16690df0fecf1a29d2 which is commit 2e083cd802294693a5414e4557a183dd7e442e71 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Ic044e2024ec360ae2dcd930bd9f8ee8e0f71a75b Signed-off-by: Greg Kroah-Hartman --- drivers/ufs/core/ufshcd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index bf5109f3c730..4fdeec819833 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -7839,8 +7839,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba) hba->silence_err_logs = false; /* scale up clocks to max frequency before full reinitialization */ - if (ufshcd_is_clkscaling_supported(hba)) - ufshcd_scale_clks(hba, ULONG_MAX, true); + ufshcd_scale_clks(hba, ULONG_MAX, true); err = ufshcd_hba_enable(hba);