Merge tag 'optee-for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

arndb · arndb · commit 95ff410d15e6 · 2026-04-01T23:52:18.000+02:00
OP-TEE update for 7.1

Simplify TEE implementor ID match logic

* tag 'optee-for-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee:
  optee: simplify OP-TEE context match

Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
@@ -13,10 +13,7 @@
 
 static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
 {
-	if (ver->impl_id == TEE_IMPL_ID_OPTEE)
-		return 1;
-	else
-		return 0;
+	return (ver->impl_id == TEE_IMPL_ID_OPTEE);
 }
 
 static int get_devices(struct tee_context *ctx, u32 session,

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,7 @@`
`13`	`13`
`14`	`14`	`static int optee_ctx_match(struct tee_ioctl_version_data ver, const void data)`
`15`	`15`	`{`
`16`		`- if (ver->impl_id == TEE_IMPL_ID_OPTEE)`
`17`		`- return 1;`
`18`		`- else`
`19`		`- return 0;`
	`16`	`+ return (ver->impl_id == TEE_IMPL_ID_OPTEE);`
`20`	`17`	`}`
`21`	`18`
`22`	`19`	`static int get_devices(struct tee_context *ctx, u32 session,`