diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2017-01-20 12:19:18 +0100 |
|---|---|---|
| committer | Jens Wiklander <jens.wiklander@linaro.org> | 2017-01-25 11:44:17 +0100 |
| commit | bdcf1e47508bd77291171b7ac2e3c6826ab71f83 (patch) | |
| tree | 37635196069880f877b562e760c5d8c6efb5e4e8 | |
| parent | 9cb0453666a2119af85dafb47caa0ae4e43b1f9d (diff) | |
tee: apply v14 delta
Applies the v12 of the generic TEE subsystem patch set.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
| -rw-r--r-- | drivers/tee/optee/optee_smc.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index ff98cb7e83c9..d470d450b182 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -438,9 +438,13 @@ struct optee_smc_disable_shm_cache_result { #define OPTEE_SMC_RETURN_EBADCMD 0x5 #define OPTEE_SMC_RETURN_ENOMEM 0x6 #define OPTEE_SMC_RETURN_ENOTAVAIL 0x7 -#define OPTEE_SMC_RETURN_IS_RPC(ret) \ - (((ret) != OPTEE_SMC_RETURN_UNKNOWN_FUNCTION) && \ - ((((ret) & OPTEE_SMC_RETURN_RPC_PREFIX_MASK) == \ - OPTEE_SMC_RETURN_RPC_PREFIX))) +#define OPTEE_SMC_RETURN_IS_RPC(ret) __optee_smc_return_is_rpc((ret)) + +static inline bool __optee_smc_return_is_rpc(u32 ret) +{ + return ret != OPTEE_SMC_RETURN_UNKNOWN_FUNCTION && + (ret & OPTEE_SMC_RETURN_RPC_PREFIX_MASK) == + OPTEE_SMC_RETURN_RPC_PREFIX; +} #endif /* OPTEE_SMC_H */ |