Merge tag 'tee-smatch-for-5.8' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

arndb · arndb · commit 6d83d800b245 · 2020-05-25T16:56:33.000+02:00
tee: remove unnecessary NULL check in tee_shm_alloc() * tag 'tee-smatch-for-5.8' of git://git.linaro.org/people/jens.wiklander/linux-tee: tee: remove unnecessary NULL check in tee_shm_alloc() Link: https://lore.kernel.org/r/20200504181333.GA11018@jade Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
@@ -162,8 +162,7 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags)
 		}
 	}
 
-	if (ctx)
-		teedev_ctx_get(ctx);
+	teedev_ctx_get(ctx);
 
 	return shm;
 err_rem:

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,7 @@ struct tee_shm tee_shm_alloc(struct tee_context ctx, size_t size, u32 flags)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`165`		`- if (ctx)`
`166`		`- teedev_ctx_get(ctx);`
	`165`	`+ teedev_ctx_get(ctx);`
`167`	`166`
`168`	`167`	`return shm;`
`169`	`168`	`err_rem:`