Commit 56d62dc2 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'optee-fix-for-v6.11' of...

Merge tag 'optee-fix-for-v6.11' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Fix optee missing-field-initializers warning

* tag 'optee-fix-for-v6.11' of https://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: ffa: Fix missing-field-initializers warning

Link: https://lore.kernel.org/r/20240627125112.GA2674988@raydenSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4b381cf4 e0556255
...@@ -660,7 +660,9 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev, ...@@ -660,7 +660,9 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
const struct ffa_ops *ops) const struct ffa_ops *ops)
{ {
const struct ffa_msg_ops *msg_ops = ops->msg_ops; const struct ffa_msg_ops *msg_ops = ops->msg_ops;
struct ffa_send_direct_data data = { OPTEE_FFA_GET_API_VERSION }; struct ffa_send_direct_data data = {
.data0 = OPTEE_FFA_GET_API_VERSION,
};
int rc; int rc;
msg_ops->mode_32bit_set(ffa_dev); msg_ops->mode_32bit_set(ffa_dev);
...@@ -677,7 +679,9 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev, ...@@ -677,7 +679,9 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
return false; return false;
} }
data = (struct ffa_send_direct_data){ OPTEE_FFA_GET_OS_VERSION }; data = (struct ffa_send_direct_data){
.data0 = OPTEE_FFA_GET_OS_VERSION,
};
rc = msg_ops->sync_send_receive(ffa_dev, &data); rc = msg_ops->sync_send_receive(ffa_dev, &data);
if (rc) { if (rc) {
pr_err("Unexpected error %d\n", rc); pr_err("Unexpected error %d\n", rc);
...@@ -698,7 +702,9 @@ static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev, ...@@ -698,7 +702,9 @@ static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
unsigned int *rpc_param_count, unsigned int *rpc_param_count,
unsigned int *max_notif_value) unsigned int *max_notif_value)
{ {
struct ffa_send_direct_data data = { OPTEE_FFA_EXCHANGE_CAPABILITIES }; struct ffa_send_direct_data data = {
.data0 = OPTEE_FFA_EXCHANGE_CAPABILITIES,
};
int rc; int rc;
rc = ops->msg_ops->sync_send_receive(ffa_dev, &data); rc = ops->msg_ops->sync_send_receive(ffa_dev, &data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment