[PATCH v3 22/24] scsi: ufs: mediatek: Make scale_us in setup_clk_gating const
From: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Date: 2025-10-23 19:53:02
Also in:
linux-devicetree, linux-mediatek, linux-phy, linux-scsi, lkml
Subsystem:
scsi subsystem, the rest, universal flash storage host controller driver mediatek hooks · Maintainers:
"James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds, Peter Wang, Chaotian Jing
The scale_us values are constant, and should be declared as such. Do this, and use ARRAY_SIZE instead of a fixed <= comparison before accessing members of the array, to avoid possible future mistakes. This results in the same assembly with clang, so there is no functional change, but it makes me feel better. Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com> --- drivers/ufs/host/ufs-mediatek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ufs/host/ufs-mediatek.c b/drivers/ufs/host/ufs-mediatek.c
index 38698fbbd228..5f5ebaf61ae0 100644
--- a/drivers/ufs/host/ufs-mediatek.c
+++ b/drivers/ufs/host/ufs-mediatek.c@@ -940,10 +940,10 @@ static void ufs_mtk_init_clocks(struct ufs_hba *hba) static void ufs_mtk_setup_clk_gating(struct ufs_hba *hba) { + const u32 scale_us[] = {1, 10, 100, 1000, 10000, 100000}; unsigned long flags; u32 ah_ms = 10; u32 ah_scale, ah_timer; - u32 scale_us[] = {1, 10, 100, 1000, 10000, 100000}; if (ufshcd_is_clkgating_allowed(hba)) { if (ufshcd_is_auto_hibern8_supported(hba) && hba->ahit) {
@@ -951,7 +951,7 @@ static void ufs_mtk_setup_clk_gating(struct ufs_hba *hba) hba->ahit); ah_timer = FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit); - if (ah_scale <= 5) + if (ah_scale < ARRAY_SIZE(scale_us)) ah_ms = ah_timer * scale_us[ah_scale] / 1000; }
--
2.51.1.dirty