53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From b1f02a027329f23272bd89c80a3f51ff64377fc2 Mon Sep 17 00:00:00 2001
|
|
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
|
|
Date: Tue, 26 Nov 2019 15:25:16 +0100
|
|
Subject: [PATCH] udmabuf: Remove deleted map/unmap handlers.
|
|
|
|
Commit 19d32ace8b6acebc45da1ea748000ac79ccc7721 upstream.
|
|
|
|
Commit 7f0de8d80816 ("dma-buf: Drop dma_buf_k(un)map") removed map/unmap
|
|
handlers, but they still existed in udmabuf. Remove them there as well
|
|
|
|
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
|
|
Fixes: 7f0de8d80816 ("dma-buf: Drop dma_buf_k(un)map")
|
|
Cc: Sumit Semwal <sumit.semwal@linaro.org>
|
|
Cc: Daniel Vetter <daniel.vetter@intel.com>
|
|
Cc: linux-media@vger.kernel.org
|
|
Cc: linaro-mm-sig@lists.linaro.org
|
|
Cc: dri-devel@lists.freedesktop.org
|
|
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20191126142516.630200-1-maarten.lankhorst@linux.intel.com
|
|
---
|
|
drivers/dma-buf/udmabuf.c | 16 ----------------
|
|
1 file changed, 16 deletions(-)
|
|
|
|
--- a/drivers/dma-buf/udmabuf.c
|
|
+++ b/drivers/dma-buf/udmabuf.c
|
|
@@ -96,26 +96,10 @@ static void release_udmabuf(struct dma_b
|
|
kfree(ubuf);
|
|
}
|
|
|
|
-static void *kmap_udmabuf(struct dma_buf *buf, unsigned long page_num)
|
|
-{
|
|
- struct udmabuf *ubuf = buf->priv;
|
|
- struct page *page = ubuf->pages[page_num];
|
|
-
|
|
- return kmap(page);
|
|
-}
|
|
-
|
|
-static void kunmap_udmabuf(struct dma_buf *buf, unsigned long page_num,
|
|
- void *vaddr)
|
|
-{
|
|
- kunmap(vaddr);
|
|
-}
|
|
-
|
|
static const struct dma_buf_ops udmabuf_ops = {
|
|
.map_dma_buf = map_udmabuf,
|
|
.unmap_dma_buf = unmap_udmabuf,
|
|
.release = release_udmabuf,
|
|
- .map = kmap_udmabuf,
|
|
- .unmap = kunmap_udmabuf,
|
|
.mmap = mmap_udmabuf,
|
|
};
|
|
|