Merge tag 'amdtee-update-for-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

arndb · arndb · commit 4b45c2f3f88c · 2026-01-21T16:29:54.000+01:00
AMDTEE update for 6.20

Remove unused return variables

* tag 'amdtee-update-for-6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee:
  tee: amdtee: Remove unused return variables

Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git a/drivers/tee/amdtee/call.c b/drivers/tee/amdtee/call.c
@@ -15,7 +15,7 @@
 static int tee_params_to_amd_params(struct tee_param *tee, u32 count,
 				    struct tee_operation *amd)
 {
-	int i, ret = 0;
+	int i;
 	u32 type;
 
 	if (!count)
@@ -66,13 +66,13 @@ static int tee_params_to_amd_params(struct tee_param *tee, u32 count,
 				 i, amd->params[i].val.b);
 		}
 	}
-	return ret;
+	return 0;
 }
 
 static int amd_params_to_tee_params(struct tee_param *tee, u32 count,
 				    struct tee_operation *amd)
 {
-	int i, ret = 0;
+	int i;
 	u32 type;
 
 	if (!count)
@@ -118,7 +118,7 @@ static int amd_params_to_tee_params(struct tee_param *tee, u32 count,
 				 i, amd->params[i].val.b);
 		}
 	}
-	return ret;
+	return 0;
 }
 
 static DEFINE_MUTEX(ta_refcount_mutex);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`static int tee_params_to_amd_params(struct tee_param *tee, u32 count,`
`16`	`16`	`struct tee_operation *amd)`
`17`	`17`	`{`
`18`		`- int i, ret = 0;`
	`18`	`+ int i;`
`19`	`19`	`u32 type;`
`20`	`20`
`21`	`21`	`if (!count)`
`@@ -66,13 +66,13 @@ static int tee_params_to_amd_params(struct tee_param *tee, u32 count,`
`66`	`66`	`i, amd->params[i].val.b);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- return ret;`
	`69`	`+ return 0;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`static int amd_params_to_tee_params(struct tee_param *tee, u32 count,`
`73`	`73`	`struct tee_operation *amd)`
`74`	`74`	`{`
`75`		`- int i, ret = 0;`
	`75`	`+ int i;`
`76`	`76`	`u32 type;`
`77`	`77`
`78`	`78`	`if (!count)`
`@@ -118,7 +118,7 @@ static int amd_params_to_tee_params(struct tee_param *tee, u32 count,`
`118`	`118`	`i, amd->params[i].val.b);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- return ret;`
	`121`	`+ return 0;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`static DEFINE_MUTEX(ta_refcount_mutex);`