tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

scsi: ufs: Use designated initializers in ufs_pm_lvl_states[]

The comments in the enum ufs_pm_level definition are redundant. Remove the
comments from the ufs_pm_level enum and use designated initializers in the
ufs_pm_lvl_states[] definition instead.

Link: https://lore.kernel.org/r/20210519202058.12634-3-bvanassche@acm.org
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Can Guo <cang@codeaurora.org>
Cc: Bean Huo <beanhuo@micron.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen e2ac7ab2 ab17122e

+14 -14
+7 -7
drivers/scsi/ufs/ufshcd.c
··· 160 160 ((h)->eh_flags &= ~UFSHCD_EH_IN_PROGRESS) 161 161 162 162 struct ufs_pm_lvl_states ufs_pm_lvl_states[] = { 163 - {UFS_ACTIVE_PWR_MODE, UIC_LINK_ACTIVE_STATE}, 164 - {UFS_ACTIVE_PWR_MODE, UIC_LINK_HIBERN8_STATE}, 165 - {UFS_SLEEP_PWR_MODE, UIC_LINK_ACTIVE_STATE}, 166 - {UFS_SLEEP_PWR_MODE, UIC_LINK_HIBERN8_STATE}, 167 - {UFS_POWERDOWN_PWR_MODE, UIC_LINK_HIBERN8_STATE}, 168 - {UFS_POWERDOWN_PWR_MODE, UIC_LINK_OFF_STATE}, 163 + [UFS_PM_LVL_0] = {UFS_ACTIVE_PWR_MODE, UIC_LINK_ACTIVE_STATE}, 164 + [UFS_PM_LVL_1] = {UFS_ACTIVE_PWR_MODE, UIC_LINK_HIBERN8_STATE}, 165 + [UFS_PM_LVL_2] = {UFS_SLEEP_PWR_MODE, UIC_LINK_ACTIVE_STATE}, 166 + [UFS_PM_LVL_3] = {UFS_SLEEP_PWR_MODE, UIC_LINK_HIBERN8_STATE}, 167 + [UFS_PM_LVL_4] = {UFS_POWERDOWN_PWR_MODE, UIC_LINK_HIBERN8_STATE}, 168 + [UFS_PM_LVL_5] = {UFS_POWERDOWN_PWR_MODE, UIC_LINK_OFF_STATE}, 169 169 /* 170 170 * For DeepSleep, the link is first put in hibern8 and then off. 171 171 * Leaving the link in hibern8 is not supported. 172 172 */ 173 - {UFS_DEEPSLEEP_PWR_MODE, UIC_LINK_OFF_STATE}, 173 + [UFS_PM_LVL_6] = {UFS_DEEPSLEEP_PWR_MODE, UIC_LINK_OFF_STATE}, 174 174 }; 175 175 176 176 static inline enum ufs_dev_pwr_mode
+7 -7
drivers/scsi/ufs/ufshcd.h
··· 155 155 * power off. 156 156 */ 157 157 enum ufs_pm_level { 158 - UFS_PM_LVL_0, /* UFS_ACTIVE_PWR_MODE, UIC_LINK_ACTIVE_STATE */ 159 - UFS_PM_LVL_1, /* UFS_ACTIVE_PWR_MODE, UIC_LINK_HIBERN8_STATE */ 160 - UFS_PM_LVL_2, /* UFS_SLEEP_PWR_MODE, UIC_LINK_ACTIVE_STATE */ 161 - UFS_PM_LVL_3, /* UFS_SLEEP_PWR_MODE, UIC_LINK_HIBERN8_STATE */ 162 - UFS_PM_LVL_4, /* UFS_POWERDOWN_PWR_MODE, UIC_LINK_HIBERN8_STATE */ 163 - UFS_PM_LVL_5, /* UFS_POWERDOWN_PWR_MODE, UIC_LINK_OFF_STATE */ 164 - UFS_PM_LVL_6, /* UFS_DEEPSLEEP_PWR_MODE, UIC_LINK_OFF_STATE */ 158 + UFS_PM_LVL_0, 159 + UFS_PM_LVL_1, 160 + UFS_PM_LVL_2, 161 + UFS_PM_LVL_3, 162 + UFS_PM_LVL_4, 163 + UFS_PM_LVL_5, 164 + UFS_PM_LVL_6, 165 165 UFS_PM_LVL_MAX 166 166 }; 167 167