hwrng: optee: Initialize some structs using memset instead of braces
Subsystems (3)
PATCH 1/1 hwrng: optee: Initialize some structs using memset instead of braces
Clang warns:
drivers/char/hw_random/optee-rng.c:80:31: warning: suggest braces around initialization of subobject [-Wmissing-braces]
struct tee_param param[4] = {0};
^
{}
drivers/char/hw_random/optee-rng.c:177:31: warning: suggest braces
around initialization of subobject [-Wmissing-braces]
struct tee_param param[4] = {0};
^
{}
drivers/char/hw_random/optee-rng.c:212:48: warning: suggest braces
around initialization of subobject [-Wmissing-braces]
struct tee_ioctl_open_session_arg sess_arg = {0};
^
{}3 warnings generated.
One way to fix these warnings is to add additional braces like Clang suggests; however, there has been a bit of push back from some maintainers, who just prefer memset as it is unambiguous, doesn't depend on a particular compiler version, and properly initializes all subobjects [1][2]. Do that here so there are no more warnings.
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
--- drivers/char/hw_random/optee-rng.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/char/hw_random/optee-rng.c +13 -5
@@ -76,8 +76,11 @@ static size_t get_optee_rng_data(struct optee_rng_private *pvt_data,u32 ret =0 ;u8 *rng_data =NULL ;size_t rng_size =0 ; -struct tee_ioctl_invoke_arg inv_arg = {0 }; -struct tee_param param[4 ] = {0 }; +struct tee_ioctl_invoke_arg inv_arg; +struct tee_param param[4 ]; + +memset (&inv_arg,0 ,sizeof (inv_arg)); +memset (¶m,0 ,sizeof (param));/* Invoke TA_CMD_GET_ENTROPY function of Trusted App */ inv_arg.func =TA_CMD_GET_ENTROPY ;
@@ -173,8 +176,11 @@ static struct optee_rng_private pvt_data = {static int get_optee_rng_info (struct device *dev) {u32 ret =0 ; -struct tee_ioctl_invoke_arg inv_arg = {0 }; -struct tee_param param[4 ] = {0 }; +struct tee_ioctl_invoke_arg inv_arg; +struct tee_param param[4 ]; + +memset (&inv_arg,0 ,sizeof (inv_arg)); +memset (¶m,0 ,sizeof (param));/* Invoke TA_CMD_GET_RNG_INFO function of Trusted App */ inv_arg.func =TA_CMD_GET_RNG_INFO ;
@@ -209,7 +215,9 @@ static int optee_rng_probe(struct device *dev) {struct tee_client_device *rng_device =to_tee_client_device (dev);int ret =0 , err = -ENODEV ; -struct tee_ioctl_open_session_arg sess_arg = {0 }; +struct tee_ioctl_open_session_arg sess_arg; + +memset (&sess_arg,0 ,sizeof (sess_arg));/* Open context with TEE driver */ pvt_data.ctx = tee_client_open_context(NULL, optee_ctx_match, NULL,
Signature · 1 line
2.21.0.rc1
Quoted 26 lines · Nathan Chancellor
Clang warns:
drivers/char/hw_random/optee-rng.c:80:31: warning: suggest braces around initialization of subobject [-Wmissing-braces]struct tee_param param[4] = {0}; ^ {} drivers/char/hw_random/optee-rng.c:177:31: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct tee_param param[4] = {0}; ^ {} drivers/char/hw_random/optee-rng.c:212:48: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct tee_ioctl_open_session_arg sess_arg = {0}; ^ {}3 warnings generated.
One way to fix these warnings is to add additional braces like Clang suggests; however, there has been a bit of push back from some maintainers, who just prefer memset as it is unambiguous, doesn't depend on a particular compiler version, and properly initializes all subobjects [1][2]. Do that here so there are no more warnings.
Quoted 6 lines
[1]: https://lore.kernel.org/lkml/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/Fixes 5fe8b1cc6a03 ("hwrng: add OP-TEE based rng driver")Signed-off-by Nathan Chancellor <[email protected]>
Quoted 50 lines
--- drivers/char/hw_random/optee-rng.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)drivers/char/hw_random/optee-rng.c +13
-6@@ -76,8 +76,11 @@ static size_t get_optee_rng_data(struct optee_rng_private *pvt_data,u32 ret =0 ;u8 *rng_data =NULL ;size_t rng_size =0 ; -struct tee_ioctl_invoke_arg inv_arg = {0 }; -struct tee_param param[4 ] = {0 }; +struct tee_ioctl_invoke_arg inv_arg; +struct tee_param param[4 ]; + +memset (&inv_arg,0 ,sizeof (inv_arg)); +memset (¶m,0 ,sizeof (param));/* Invoke TA_CMD_GET_ENTROPY function of Trusted App */ inv_arg.func =TA_CMD_GET_ENTROPY ;@@ -173,8 +176,11 @@ static struct optee_rng_private pvt_data = {static int get_optee_rng_info (struct device *dev) {u32 ret =0 ; -struct tee_ioctl_invoke_arg inv_arg = {0 }; -struct tee_param param[4 ] = {0 }; +struct tee_ioctl_invoke_arg inv_arg; +struct tee_param param[4 ]; + +memset (&inv_arg,0 ,sizeof (inv_arg)); +memset (¶m,0 ,sizeof (param));/* Invoke TA_CMD_GET_RNG_INFO function of Trusted App */ inv_arg.func =TA_CMD_GET_RNG_INFO ;@@ -209,7 +215,9 @@ static int optee_rng_probe(struct device *dev) {struct tee_client_device *rng_device =to_tee_client_device (dev);int ret =0 , err = -ENODEV ; -struct tee_ioctl_open_session_arg sess_arg = {0 }; +struct tee_ioctl_open_session_arg sess_arg; + +memset (&sess_arg,0 ,sizeof (sess_arg));/* Open context with TEE driver */ pvt_data.ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, --2.21.0.rc1
Arnd Bergmann
AppliedQuoted 10 lines · Sumit Garg
Quoted 4 lines · Nathan Chancellor
Fixes 5fe8b1cc6a03 ("hwrng: add OP-TEE based rng driver")Signed-off-by Nathan Chancellor <[email protected]>Reviewed-by Sumit Garg <[email protected]>
Applied this one as well to arm/drivers, thanks for the fixes!
Arnd