tee: remove redundant teedev in struct tee_shm (5271b201) · Commits · 戴 / test

drivers/tee/tee_shm.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@

		static void tee_shm_release(struct tee_shm *shm)
		{
		struct tee_device *teedev = shm->teedev;
		struct tee_device *teedev = shm->ctx->teedev;

		if (shm->flags & TEE_SHM_DMA_BUF) {
		mutex_lock(&teedev->mutex);
		@@ -44,7 +44,6 @@ static void tee_shm_release(struct tee_shm *shm)
		kfree(shm->pages);
		}

		if (shm->ctx)
		teedev_ctx_put(shm->ctx);

		kfree(shm);
		@@ -126,7 +125,6 @@ struct tee_shm tee_shm_alloc(struct tee_context ctx, size_t size, u32 flags)
		}

		shm->flags = flags \| TEE_SHM_POOL;
		shm->teedev = teedev;
		shm->ctx = ctx;
		if (flags & TEE_SHM_DMA_BUF)
		poolm = teedev->pool->dma_buf_mgr;
		@@ -215,7 +213,6 @@ struct tee_shm tee_shm_register(struct tee_context ctx, unsigned long addr,
		}

		shm->flags = flags \| TEE_SHM_REGISTER;
		shm->teedev = teedev;
		shm->ctx = ctx;
		shm->id = -1;
		addr = untagged_addr(addr);

+1 −3

Original line number	Diff line number	Diff line
		@@ -167,8 +167,7 @@ void tee_device_unregister(struct tee_device *teedev);

		/**
		* struct tee_shm - shared memory object
		* @teedev: device used to allocate the object
		* @ctx: context using the object, if NULL the context is gone
		* @ctx: context using the object
		* @paddr: physical address of the shared memory
		* @kaddr: virtual address of the shared memory
		* @size: size of shared memory
		@@ -183,7 +182,6 @@ void tee_device_unregister(struct tee_device *teedev);
		* subsystem and from drivers that implements their own shm pool manager.
		*/
		struct tee_shm {
		struct tee_device *teedev;
		struct tee_context *ctx;
		phys_addr_t paddr;
		void *kaddr;