From da7b445d87a43f5725d519b59f59ffe8227cc1d7 Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Fri, 3 Dec 2021 09:23:33 +0800 Subject: [PATCH] Revert "dma-buf: dma-heap set device max_segment_size to DMA_BIT_MASK(32)" This reverts commit 146b4dc1dee3980d909656244d2a3840b162a21e. Signed-off-by: Jianqun Xu Change-Id: I976eab106bf18eb18be3ae861c2b2f46c6a4869e --- drivers/dma-buf/dma-heap.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c index b2cf6fa30bc5..4fb22001b2ca 100644 --- a/drivers/dma-buf/dma-heap.c +++ b/drivers/dma-buf/dma-heap.c @@ -358,22 +358,6 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) goto err2; } - if (IS_ENABLED(CONFIG_NO_GKI)) { - heap->heap_dev->dma_parms = kzalloc(sizeof(*heap->heap_dev->dma_parms), GFP_KERNEL); - if (!heap->heap_dev->dma_parms) { - err_ret = ERR_PTR(-ENOMEM); - goto err3; - } - - ret = dma_set_max_seg_size(heap->heap_dev, (unsigned int)DMA_BIT_MASK(32)); - if (ret) { - pr_err("dma_heap: Unable to set seg size\n"); - kfree(heap->heap_dev->dma_parms); - err_ret = ERR_PTR(ret); - goto err3; - } - } - /* Make sure it doesn't disappear on us */ heap->heap_dev = get_device(heap->heap_dev); @@ -384,8 +368,6 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) return heap; -err3: - device_destroy(dma_heap_class, heap->heap_devt); err2: cdev_del(&heap->heap_cdev); err1: