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 */