firmware: qcom: avoid struct initialization warning on gcc-4.8
PATCH 1/1 firmware: qcom: avoid struct initialization warning on gcc-4.8
When building with old compilers like gcc-4.8, a struct initializer can warn about invalid syntax:
drivers/firmware/qcom_scm-smc.c: In function 'scm_smc_call':drivers/firmware/qcom_scm-smc.c:94:9: error: missing braces around initializer [-Werror=missing-braces]
struct arm_smccc_args smc = {0};
^drivers/firmware/qcom_scm-smc.c:94:9: error: (near initialization for 'smc.args') [-Werror=missing-braces]
cc1: some warnings being treated as errorsdrivers/firmware/qcom_scm-legacy.c: In function 'scm_legacy_call':drivers/firmware/qcom_scm-legacy.c:139:9: error: missing braces around initializer [-Werror=missing-braces]
struct arm_smccc_args smc = {0};
^drivers/firmware/qcom_scm-legacy.c:139:9: error: (near initialization for 'smc.args') [-Werror=missing-braces]
Change this to use the empty initializer extension that works with all compilers.
--- drivers/firmware/qcom_scm-legacy.c | 2 +- drivers/firmware/qcom_scm-smc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/qcom_scm-legacy.c +1 -1
@@ -136,7 +136,7 @@ int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc,unsigned int i;struct scm_legacy_command *cmd;struct scm_legacy_response *rsp; -struct arm_smccc_args smc = {0 }; +struct arm_smccc_args smc = { };struct arm_smccc_res smc_res;const size_t cmd_len = arglen *sizeof (__le32);const size_t resp_len =MAX_QCOM_SCM_RETS *sizeof (__le32);
drivers/firmware/qcom_scm-smc.c +1 -1
@@ -91,7 +91,7 @@ int scm_smc_call(struct device *dev, const struct qcom_scm_desc *desc, (qcom_scm_convention ==SMC_CONVENTION_ARM_32 ) ?ARM_SMCCC_SMC_32 :ARM_SMCCC_SMC_64 ;struct arm_smccc_res smc_res; -struct arm_smccc_args smc = {0 }; +struct arm_smccc_args smc = { }; smc.args[0] = ARM_SMCCC_CALL_VAL( smccc_call_type,
Signature · 1 line
2.26.0
Quoting Arnd Bergmann (2020-04-29 01:57:33)
Quoted 15 lines
When building with old compilers like gcc-4.8, a struct initializer can warn about invalid syntax:
drivers/firmware/qcom_scm-smc.c: In function 'scm_smc_call':drivers/firmware/qcom_scm-smc.c:94:9: error: missing braces around initializer [-Werror=missing-braces]struct arm_smccc_args smc = {0}; ^
drivers/firmware/qcom_scm-smc.c:94:9: error: (near initialization for 'smc.args') [-Werror=missing-braces]
cc1: some warnings being treated as errorsdrivers/firmware/qcom_scm-legacy.c: In function 'scm_legacy_call':drivers/firmware/qcom_scm-legacy.c:139:9: error: missing braces around initializer [-Werror=missing-braces]struct arm_smccc_args smc = {0}; ^
drivers/firmware/qcom_scm-legacy.c:139:9: error: (near initialization for 'smc.args') [-Werror=missing-braces]
Quoted 7 lines
Change this to use the empty initializer extension that works with all compilers.
Fixes 590e92809a58 ("firmware: qcom_scm-32: Move SMCCC register filling to qcom_scm_call")Fixes 3f951ea627da ("firmware: qcom_scm-64: Move SMC register filling to qcom_scm_call_smccc")Signed-off-by Arnd Bergmann <[email protected]>---