diff options
| -rw-r--r-- | drivers/tee/tee_shm.c | 11 | ||||
| -rw-r--r-- | include/linux/tee_drv.h | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index ba02a15eefcb..04e1b8b37046 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c | |||
| @@ -497,17 +497,6 @@ struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id) | |||
| 497 | EXPORT_SYMBOL_GPL(tee_shm_get_from_id); | 497 | EXPORT_SYMBOL_GPL(tee_shm_get_from_id); |
| 498 | 498 | ||
| 499 | /** | 499 | /** |
| 500 | * tee_shm_get_id() - Get id of a shared memory object | ||
| 501 | * @shm: Shared memory handle | ||
| 502 | * @returns id | ||
| 503 | */ | ||
| 504 | int tee_shm_get_id(struct tee_shm *shm) | ||
| 505 | { | ||
| 506 | return shm->id; | ||
| 507 | } | ||
| 508 | EXPORT_SYMBOL_GPL(tee_shm_get_id); | ||
| 509 | |||
| 510 | /** | ||
| 511 | * tee_shm_put() - Decrease reference count on a shared memory handle | 500 | * tee_shm_put() - Decrease reference count on a shared memory handle |
| 512 | * @shm: Shared memory handle | 501 | * @shm: Shared memory handle |
| 513 | */ | 502 | */ |
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 157e8d06bf49..a1d7f467657c 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h | |||
| @@ -438,7 +438,10 @@ static inline size_t tee_shm_get_page_offset(struct tee_shm *shm) | |||
| 438 | * @shm: Shared memory handle | 438 | * @shm: Shared memory handle |
| 439 | * @returns id | 439 | * @returns id |
| 440 | */ | 440 | */ |
| 441 | int tee_shm_get_id(struct tee_shm *shm); | 441 | static inline int tee_shm_get_id(struct tee_shm *shm) |
| 442 | { | ||
| 443 | return shm->id; | ||
| 444 | } | ||
| 442 | 445 | ||
| 443 | /** | 446 | /** |
| 444 | * tee_shm_get_from_id() - Find shared memory object and increase reference | 447 | * tee_shm_get_from_id() - Find shared memory object and increase reference |
