scsi: ufs: fix missing brace warning for old compilers
PATCH v2 1/1 scsi: ufs: fix missing brace warning for old compilers
For older versions of gcc, the array = {0}; will cause warnings:
drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_crypto_keyslot_program':drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: missing braces around initializer [-Wmissing-braces]
union ufs_crypto_cfg_entry cfg = { 0 };
^
drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: (near initialization for 'cfg.reg_val') [-Wmissing-braces]
drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_clear_keyslot':
drivers/scsi/ufs/ufshcd-crypto.c:103:8: warning: missing braces around initializer [-Wmissing-braces]
union ufs_crypto_cfg_entry cfg = { 0 };
^2 warnings generated
--- drivers/scsi/ufs/ufshcd-crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd-crypto.c +2 -2
@@ -59,7 +59,7 @@ static int ufshcd_crypto_keyslot_program(struct blk_keyslot_manager *ksm,u8 data_unit_mask = key->crypto_cfg.data_unit_size /512 ;int i;int cap_idx =-1 ; -union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg = {};int err;BUILD_BUG_ON (UFS_CRYPTO_KEY_SIZE_INVALID !=0 );
@@ -100,7 +100,7 @@ static int ufshcd_clear_keyslot(struct ufs_hba *hba, int slot)* Clear the crypto cfg on the device. Clearing CFGE * might not be sufficient, so just clear the entire cfg. */ -union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg = {};return ufshcd_program_key (hba, &cfg, slot); }
Signature · 1 line
2.18.1
Quoted 33 lines · Pujin Shi
For older versions of gcc, the array = {0}; will cause warnings:
drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_crypto_keyslot_program':drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: missing braces around initializer [-Wmissing-braces]union ufs_crypto_cfg_entry cfg = { 0 }; ^ drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: (near initialization for 'cfg.reg_val') [-Wmissing-braces] drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_clear_keyslot': drivers/scsi/ufs/ufshcd-crypto.c:103:8: warning: missing braces around initializer [-Wmissing-braces] union ufs_crypto_cfg_entry cfg = { 0 }; ^2 warnings generated
Fixes 70297a8ac7a7 ("scsi: ufs: UFS crypto API")Signed-off-by Pujin Shi <[email protected]>--- drivers/scsi/ufs/ufshcd-crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/scsi/ufs/ufshcd-crypto.c +1
-1@@ -59,7 +59,7 @@ static int ufshcd_crypto_keyslot_program(struct blk_keyslot_manager *ksm,u8 data_unit_mask = key->crypto_cfg.data_unit_size /512 ;int i;int cap_idx =-1 ; -union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg = {};int err;BUILD_BUG_ON (UFS_CRYPTO_KEY_SIZE_INVALID !=0 );
drivers/scsi/ufs/ufshcd-crypto.c static int ufshcd_clear_keyslot(struct ufs_hba *hba, int slot) · line 104
Quoted 6 lines
drivers/scsi/ufs/ufshcd-crypto.c +1
-1@@ -100,7 +100,7 @@ static int ufshcd_clear_keyslot(struct ufs_hba *hba, int slot)* Clear the crypto cfg on the device. Clearing CFGE * might not be sufficient, so just clear the entire cfg. */ -union ufs_crypto_cfg_entry cfg = {0 }; +union ufs_crypto_cfg_entry cfg = {};
Looks good,
Martin K. Petersen
AppliedPujin,
Quoted 4 lines
For older versions of gcc, the array = {0}; will cause warnings:
drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_crypto_keyslot_program':drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: missing braces around initializer [-Wmissing-braces]
Quoted 8 lines
union ufs_crypto_cfg_entry cfg = { 0 }; ^ drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: (near initialization for 'cfg.reg_val') [-Wmissing-braces] drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_clear_keyslot': drivers/scsi/ufs/ufshcd-crypto.c:103:8: warning: missing braces around initializer [-Wmissing-braces] union ufs_crypto_cfg_entry cfg = { 0 }; ^2 warnings generated
Applied to 5.10/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 4 lines · Pujin Shi
For older versions of gcc, the array = {0}; will cause warnings:
drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_crypto_keyslot_program':drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: missing braces around initializer [-Wmissing-braces]
Quoted 8 lines
union ufs_crypto_cfg_entry cfg = { 0 }; ^ drivers/scsi/ufs/ufshcd-crypto.c:62:8: warning: (near initialization for 'cfg.reg_val') [-Wmissing-braces] drivers/scsi/ufs/ufshcd-crypto.c: In function 'ufshcd_clear_keyslot': drivers/scsi/ufs/ufshcd-crypto.c:103:8: warning: missing braces around initializer [-Wmissing-braces] union ufs_crypto_cfg_entry cfg = { 0 }; ^2 warnings generated
Applied to 5.10/scsi-queue, thanks!
[1/1] scsi: ufs: Fix missing brace warning for old compilers
https://git.kernel.org/mkp/scsi/c/6500251e5906
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering