optee: rename rpc_arg_count to rpc_param_count
Renames the field rpc_arg_count in struct optee to rpc_param_count. Function parameter names and local variables are also renamed to match. Reviewed-by: Sumit Garg <sumit.garg@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
parent
3123109284
commit
30c375a7f6
@ -113,12 +113,12 @@ struct tee_shm *optee_get_msg_arg(struct tee_context *ctx, size_t num_params,
|
||||
struct optee_msg_arg *ma;
|
||||
|
||||
/*
|
||||
* rpc_arg_count is set to the number of allocated parameters in
|
||||
* rpc_param_count is set to the number of allocated parameters in
|
||||
* the RPC argument struct if a second MSG arg struct is expected.
|
||||
* The second arg struct will then be used for RPC.
|
||||
*/
|
||||
if (optee->rpc_arg_count)
|
||||
sz += OPTEE_MSG_GET_ARG_SIZE(optee->rpc_arg_count);
|
||||
if (optee->rpc_param_count)
|
||||
sz += OPTEE_MSG_GET_ARG_SIZE(optee->rpc_param_count);
|
||||
|
||||
shm = tee_shm_alloc_priv_buf(ctx, sz);
|
||||
if (IS_ERR(shm))
|
||||
|
@ -678,7 +678,7 @@ static bool optee_ffa_api_is_compatbile(struct ffa_device *ffa_dev,
|
||||
|
||||
static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
|
||||
const struct ffa_dev_ops *ops,
|
||||
unsigned int *rpc_arg_count)
|
||||
unsigned int *rpc_param_count)
|
||||
{
|
||||
struct ffa_send_direct_data data = { OPTEE_FFA_EXCHANGE_CAPABILITIES };
|
||||
int rc;
|
||||
@ -693,7 +693,7 @@ static bool optee_ffa_exchange_caps(struct ffa_device *ffa_dev,
|
||||
return false;
|
||||
}
|
||||
|
||||
*rpc_arg_count = (u8)data.data1;
|
||||
*rpc_param_count = (u8)data.data1;
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -772,7 +772,7 @@ static void optee_ffa_remove(struct ffa_device *ffa_dev)
|
||||
static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
{
|
||||
const struct ffa_dev_ops *ffa_ops;
|
||||
unsigned int rpc_arg_count;
|
||||
unsigned int rpc_param_count;
|
||||
struct tee_shm_pool *pool;
|
||||
struct tee_device *teedev;
|
||||
struct tee_context *ctx;
|
||||
@ -788,7 +788,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
if (!optee_ffa_api_is_compatbile(ffa_dev, ffa_ops))
|
||||
return -EINVAL;
|
||||
|
||||
if (!optee_ffa_exchange_caps(ffa_dev, ffa_ops, &rpc_arg_count))
|
||||
if (!optee_ffa_exchange_caps(ffa_dev, ffa_ops, &rpc_param_count))
|
||||
return -EINVAL;
|
||||
|
||||
optee = kzalloc(sizeof(*optee), GFP_KERNEL);
|
||||
@ -805,7 +805,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
|
||||
optee->ops = &optee_ffa_ops;
|
||||
optee->ffa.ffa_dev = ffa_dev;
|
||||
optee->ffa.ffa_ops = ffa_ops;
|
||||
optee->rpc_arg_count = rpc_arg_count;
|
||||
optee->rpc_param_count = rpc_param_count;
|
||||
|
||||
teedev = tee_device_alloc(&optee_ffa_clnt_desc, NULL, optee->pool,
|
||||
optee);
|
||||
|
@ -143,7 +143,7 @@ struct optee_ops {
|
||||
* @notif: notification synchronization struct
|
||||
* @supp: supplicant synchronization struct for RPC to supplicant
|
||||
* @pool: shared memory pool
|
||||
* @rpc_arg_count: If > 0 number of RPC parameters to make room for
|
||||
* @rpc_param_count: If > 0 number of RPC parameters to make room for
|
||||
* @scan_bus_done flag if device registation was already done.
|
||||
* @scan_bus_wq workqueue to scan optee bus and register optee drivers
|
||||
* @scan_bus_work workq to scan optee bus and register optee drivers
|
||||
@ -161,7 +161,7 @@ struct optee {
|
||||
struct optee_notif notif;
|
||||
struct optee_supp supp;
|
||||
struct tee_shm_pool *pool;
|
||||
unsigned int rpc_arg_count;
|
||||
unsigned int rpc_param_count;
|
||||
bool scan_bus_done;
|
||||
struct workqueue_struct *scan_bus_wq;
|
||||
struct work_struct scan_bus_work;
|
||||
|
Loading…
x
Reference in New Issue
Block a user