scsi: ufs: Fix missing brace warning for old compilers
authorPujin Shi <shipujin.t@gmail.com>
Fri, 2 Oct 2020 06:35:38 +0000 (14:35 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 2 Oct 2020 23:11:55 +0000 (19:11 -0400)
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

Link: https://lore.kernel.org/r/20201002063538.1250-1-shipujin.t@gmail.com
Fixes: 70297a8ac7a7 ("scsi: ufs: UFS crypto API")
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Pujin Shi <shipujin.t@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/ufs/ufshcd-crypto.c

index d2edbd9..07310b1 100644 (file)
@@ -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);
 }