* [PATCH] tee: optee: Initialize some structs using memset instead of braces
@ 2019-02-19 9:15 Nathan Chancellor
2019-02-19 9:47 ` Sumit Garg
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2019-02-19 9:15 UTC (permalink / raw)
To: Jens Wiklander, Sumit Garg
Cc: linux-kernel, Daniel Thompson, Nick Desaulniers, Nathan Chancellor
Clang warns:
drivers/tee/optee/device.c:39:31: warning: suggest braces around
initialization of subobject [-Wmissing-braces]
struct tee_param param[4] = {0};
^
{}
drivers/tee/optee/device.c:92:48: warning: suggest braces around
initialization of subobject [-Wmissing-braces]
struct tee_ioctl_open_session_arg sess_arg = {0};
^
{}
2 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/022e41c0-8465-dc7a-a45c-64187ecd9684@amd.com/
[2]: https://lore.kernel.org/lkml/20181128.215241.702406654469517539.davem@davemloft.net/
Fixes: c3fa24af9244 ("tee: optee: add TEE bus device enumeration support")
Link: https://github.com/ClangBuiltLinux/linux/issues/370
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
drivers/tee/optee/device.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
index 5e4938bbef2b..167839b371f2 100644
--- a/drivers/tee/optee/device.c
+++ b/drivers/tee/optee/device.c
@@ -35,8 +35,11 @@ static int get_devices(struct tee_context *ctx, u32 session,
struct tee_shm *device_shm, u32 *shm_size)
{
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 PTA_CMD_GET_DEVICES function */
inv_arg.func = PTA_CMD_GET_DEVICES;
@@ -89,13 +92,15 @@ int optee_enumerate_devices(void)
const uuid_t pta_uuid =
UUID_INIT(0x7011a688, 0xddde, 0x4053,
0xa5, 0xa9, 0x7b, 0x3c, 0x4d, 0xdf, 0x13, 0xb8);
- struct tee_ioctl_open_session_arg sess_arg = {0};
+ struct tee_ioctl_open_session_arg sess_arg;
struct tee_shm *device_shm = NULL;
const uuid_t *device_uuid = NULL;
struct tee_context *ctx = NULL;
u32 shm_size = 0, idx, num_devices = 0;
int rc;
+ memset(&sess_arg, 0, sizeof(sess_arg));
+
/* Open context with OP-TEE driver */
ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL);
if (IS_ERR(ctx))
--
2.21.0.rc1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tee: optee: Initialize some structs using memset instead of braces
2019-02-19 9:15 [PATCH] tee: optee: Initialize some structs using memset instead of braces Nathan Chancellor
@ 2019-02-19 9:47 ` Sumit Garg
2019-02-20 15:23 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Sumit Garg @ 2019-02-19 9:47 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Jens Wiklander, Linux Kernel Mailing List, Daniel Thompson,
Nick Desaulniers
On Tue, 19 Feb 2019 at 14:45, Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns:
>
> drivers/tee/optee/device.c:39:31: warning: suggest braces around
> initialization of subobject [-Wmissing-braces]
> struct tee_param param[4] = {0};
> ^
> {}
> drivers/tee/optee/device.c:92:48: warning: suggest braces around
> initialization of subobject [-Wmissing-braces]
> struct tee_ioctl_open_session_arg sess_arg = {0};
> ^
> {}
> 2 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/022e41c0-8465-dc7a-a45c-64187ecd9684@amd.com/
> [2]: https://lore.kernel.org/lkml/20181128.215241.702406654469517539.davem@davemloft.net/
>
> Fixes: c3fa24af9244 ("tee: optee: add TEE bus device enumeration support")
> Link: https://github.com/ClangBuiltLinux/linux/issues/370
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
> ---
> drivers/tee/optee/device.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
> index 5e4938bbef2b..167839b371f2 100644
> --- a/drivers/tee/optee/device.c
> +++ b/drivers/tee/optee/device.c
> @@ -35,8 +35,11 @@ static int get_devices(struct tee_context *ctx, u32 session,
> struct tee_shm *device_shm, u32 *shm_size)
> {
> 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 PTA_CMD_GET_DEVICES function */
> inv_arg.func = PTA_CMD_GET_DEVICES;
> @@ -89,13 +92,15 @@ int optee_enumerate_devices(void)
> const uuid_t pta_uuid =
> UUID_INIT(0x7011a688, 0xddde, 0x4053,
> 0xa5, 0xa9, 0x7b, 0x3c, 0x4d, 0xdf, 0x13, 0xb8);
> - struct tee_ioctl_open_session_arg sess_arg = {0};
> + struct tee_ioctl_open_session_arg sess_arg;
> struct tee_shm *device_shm = NULL;
> const uuid_t *device_uuid = NULL;
> struct tee_context *ctx = NULL;
> u32 shm_size = 0, idx, num_devices = 0;
> int rc;
>
> + memset(&sess_arg, 0, sizeof(sess_arg));
> +
> /* Open context with OP-TEE driver */
> ctx = tee_client_open_context(NULL, optee_ctx_match, NULL, NULL);
> if (IS_ERR(ctx))
> --
> 2.21.0.rc1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tee: optee: Initialize some structs using memset instead of braces
2019-02-19 9:47 ` Sumit Garg
@ 2019-02-20 15:23 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2019-02-20 15:23 UTC (permalink / raw)
To: Sumit Garg
Cc: Nathan Chancellor, Jens Wiklander, Linux Kernel Mailing List,
Daniel Thompson, Nick Desaulniers, arm-soc
On Tue, Feb 19, 2019 at 10:50 AM Sumit Garg <sumit.garg@linaro.org> wrote:
> On Tue, 19 Feb 2019 at 14:45, Nathan Chancellor <natechancellor@gmail.com> wrote:
> >
> > Fixes: c3fa24af9244 ("tee: optee: add TEE bus device enumeration support")
> > Link: https://github.com/ClangBuiltLinux/linux/issues/370
> > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
>
> Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
I independently noticed the same bug, so I went ahead and applied Nathan's
fix with your Reviewed-by tag into the arm/drivers tree.
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-20 15:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-19 9:15 [PATCH] tee: optee: Initialize some structs using memset instead of braces Nathan Chancellor
2019-02-19 9:47 ` Sumit Garg
2019-02-20 15:23 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).