aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

tee: remove unused tee_shm_priv_alloc()

Browse Source 
tee_shm_priv_alloc() isn't useful in the current state and it's also not
not used so remove it.

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
Jens Wiklander
2019-11-07 11:42:52 +01:00
parent 59a135f6fb
commit c180f9bbe2
2 changed files with 2 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/tee/tee_shm.c
View File

@@ -89,20 +89,14 @@ static const struct dma_buf_ops tee_shm_dma_buf_ops = {
.mmap = tee_shm_op_mmap, .mmap = tee_shm_op_mmap,
}; };
static struct tee_shm *__tee_shm_alloc(struct tee_context *ctx, struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags)
struct tee_device *teedev,
size_t size, u32 flags)
{ {
struct tee_device *teedev = ctx->teedev;
struct tee_shm_pool_mgr *poolm = NULL; struct tee_shm_pool_mgr *poolm = NULL;
struct tee_shm *shm; struct tee_shm *shm;
void *ret; void *ret;
int rc; int rc;
if (ctx && ctx->teedev != teedev) {
dev_err(teedev->dev.parent, "ctx and teedev mismatch\n");
return ERR_PTR(-EINVAL);
}
if (!(flags & TEE_SHM_MAPPED)) { if (!(flags & TEE_SHM_MAPPED)) {
dev_err(teedev->dev.parent, dev_err(teedev->dev.parent,
"only mapped allocations supported\n"); "only mapped allocations supported\n");
@@ -182,31 +176,8 @@ err_dev_put:
tee_device_put(teedev); tee_device_put(teedev);
return ret; return ret;
} }
/**
* tee_shm_alloc() - Allocate shared memory
* @ctx: Context that allocates the shared memory
* @size: Requested size of shared memory
* @flags: Flags setting properties for the requested shared memory.
*
* Memory allocated as global shared memory is automatically freed when the
* TEE file pointer is closed. The @flags field uses the bits defined by
* TEE_SHM_* in <linux/tee_drv.h>. TEE_SHM_MAPPED must currently always be
* set. If TEE_SHM_DMA_BUF global shared memory will be allocated and
* associated with a dma-buf handle, else driver private memory.
*/
struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags)
{
return __tee_shm_alloc(ctx, ctx->teedev, size, flags);
}
EXPORT_SYMBOL_GPL(tee_shm_alloc); EXPORT_SYMBOL_GPL(tee_shm_alloc);
struct tee_shm *tee_shm_priv_alloc(struct tee_device *teedev, size_t size)
{
return __tee_shm_alloc(NULL, teedev, size, TEE_SHM_MAPPED);
}
EXPORT_SYMBOL_GPL(tee_shm_priv_alloc);
struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
size_t length, u32 flags) size_t length, u32 flags)
{ {

12
include/linux/tee_drv.h
View File

@@ -315,18 +315,6 @@ void *tee_get_drvdata(struct tee_device *teedev);
*/ */
struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags); struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags);
/**
* tee_shm_priv_alloc() - Allocate shared memory privately
* @dev: Device that allocates the shared memory
* @size: Requested size of shared memory
*
* Allocates shared memory buffer that is not associated with any client
* context. Such buffers are owned by TEE driver and used for internal calls.
*
* @returns a pointer to 'struct tee_shm'
*/
struct tee_shm *tee_shm_priv_alloc(struct tee_device *teedev, size_t size);
/** /**
* tee_shm_register() - Register shared memory buffer * tee_shm_register() - Register shared memory buffer
* @ctx: Context that registers the shared memory * @ctx: Context that registers the shared memory