Commit 86e59cc5 authored by Jared Kangas's avatar Jared Kangas Committed by Sumit Semwal
Browse files

dma-buf: heaps: Parameterize heap name in __add_cma_heap() 



Prepare for the introduction of a fixed-name CMA heap by replacing the
unused void pointer parameter in __add_cma_heap() with the heap name.

Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Acked-by: default avatarJohn Stultz <jstultz@google.com>
Signed-off-by: default avatarJared Kangas <jkangas@redhat.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: https://lore.kernel.org/r/20250610131231.1724627-3-jkangas@redhat.com
parent c2d636dc

drivers/dma-buf/heaps/cma_heap.c

+11 −7
Original line number Diff line number Diff line
@@ -366,17 +366,17 @@ static const struct dma_heap_ops cma_heap_ops = { 
	.allocate = cma_heap_allocate,

};



static int __init __add_cma_heap(struct cma *cma, void *data)

static int __init __add_cma_heap(struct cma *cma, const char *name)

{

	struct cma_heap *cma_heap;

	struct dma_heap_export_info exp_info;

	struct cma_heap *cma_heap;



	cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);

	if (!cma_heap)

		return -ENOMEM;

	cma_heap->cma = cma;



	exp_info.name = cma_get_name(cma);

	exp_info.name = name;

	exp_info.ops = &cma_heap_ops;

	exp_info.priv = cma_heap;
@@ -394,12 +394,16 @@ static int __init __add_cma_heap(struct cma *cma, void *data) 
static int __init add_default_cma_heap(void)

{

	struct cma *default_cma = dev_get_cma_area(NULL);

	int ret = 0;

	int ret;



	if (default_cma)

		ret = __add_cma_heap(default_cma, NULL);

	if (!default_cma)

		return 0;



	ret = __add_cma_heap(default_cma, cma_get_name(default_cma));

	if (ret)

		return ret;



	return 0;

}

module_init(add_default_cma_heap);

MODULE_DESCRIPTION("DMA-BUF CMA Heap");