tee: remove linked list of struct tee_shm
Removes list_shm from struct tee_context since the linked list isn't used any longer. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
Родитель
11a48a5a18
Коммит
59a135f6fb
|
@ -44,7 +44,6 @@ static struct tee_context *teedev_open(struct tee_device *teedev)
|
||||||
|
|
||||||
kref_init(&ctx->refcount);
|
kref_init(&ctx->refcount);
|
||||||
ctx->teedev = teedev;
|
ctx->teedev = teedev;
|
||||||
INIT_LIST_HEAD(&ctx->list_shm);
|
|
||||||
rc = teedev->desc->ops->open(ctx);
|
rc = teedev->desc->ops->open(ctx);
|
||||||
if (rc)
|
if (rc)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
|
@ -17,8 +17,6 @@ static void tee_shm_release(struct tee_shm *shm)
|
||||||
|
|
||||||
mutex_lock(&teedev->mutex);
|
mutex_lock(&teedev->mutex);
|
||||||
idr_remove(&teedev->idr, shm->id);
|
idr_remove(&teedev->idr, shm->id);
|
||||||
if (shm->ctx)
|
|
||||||
list_del(&shm->link);
|
|
||||||
mutex_unlock(&teedev->mutex);
|
mutex_unlock(&teedev->mutex);
|
||||||
|
|
||||||
if (shm->flags & TEE_SHM_POOL) {
|
if (shm->flags & TEE_SHM_POOL) {
|
||||||
|
@ -168,12 +166,8 @@ static struct tee_shm *__tee_shm_alloc(struct tee_context *ctx,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctx) {
|
if (ctx)
|
||||||
teedev_ctx_get(ctx);
|
teedev_ctx_get(ctx);
|
||||||
mutex_lock(&teedev->mutex);
|
|
||||||
list_add_tail(&shm->link, &ctx->list_shm);
|
|
||||||
mutex_unlock(&teedev->mutex);
|
|
||||||
}
|
|
||||||
|
|
||||||
return shm;
|
return shm;
|
||||||
err_rem:
|
err_rem:
|
||||||
|
@ -301,10 +295,6 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_lock(&teedev->mutex);
|
|
||||||
list_add_tail(&shm->link, &ctx->list_shm);
|
|
||||||
mutex_unlock(&teedev->mutex);
|
|
||||||
|
|
||||||
return shm;
|
return shm;
|
||||||
err:
|
err:
|
||||||
if (shm) {
|
if (shm) {
|
||||||
|
|
|
@ -49,7 +49,6 @@ struct tee_shm_pool;
|
||||||
*/
|
*/
|
||||||
struct tee_context {
|
struct tee_context {
|
||||||
struct tee_device *teedev;
|
struct tee_device *teedev;
|
||||||
struct list_head list_shm;
|
|
||||||
void *data;
|
void *data;
|
||||||
struct kref refcount;
|
struct kref refcount;
|
||||||
bool releasing;
|
bool releasing;
|
||||||
|
@ -170,7 +169,6 @@ void tee_device_unregister(struct tee_device *teedev);
|
||||||
* struct tee_shm - shared memory object
|
* struct tee_shm - shared memory object
|
||||||
* @teedev: device used to allocate the object
|
* @teedev: device used to allocate the object
|
||||||
* @ctx: context using the object, if NULL the context is gone
|
* @ctx: context using the object, if NULL the context is gone
|
||||||
* @link link element
|
|
||||||
* @paddr: physical address of the shared memory
|
* @paddr: physical address of the shared memory
|
||||||
* @kaddr: virtual address of the shared memory
|
* @kaddr: virtual address of the shared memory
|
||||||
* @size: size of shared memory
|
* @size: size of shared memory
|
||||||
|
@ -187,7 +185,6 @@ void tee_device_unregister(struct tee_device *teedev);
|
||||||
struct tee_shm {
|
struct tee_shm {
|
||||||
struct tee_device *teedev;
|
struct tee_device *teedev;
|
||||||
struct tee_context *ctx;
|
struct tee_context *ctx;
|
||||||
struct list_head link;
|
|
||||||
phys_addr_t paddr;
|
phys_addr_t paddr;
|
||||||
void *kaddr;
|
void *kaddr;
|
||||||
size_t size;
|
size_t size;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче