kernel: bump 5.4 to 5.4.48
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0724-udmabuf-Remove-deleted-map-unmap-handlers.patch
1 From b1f02a027329f23272bd89c80a3f51ff64377fc2 Mon Sep 17 00:00:00 2001
2 From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
3 Date: Tue, 26 Nov 2019 15:25:16 +0100
4 Subject: [PATCH] udmabuf: Remove deleted map/unmap handlers.
5
6 Commit 19d32ace8b6acebc45da1ea748000ac79ccc7721 upstream.
7
8 Commit 7f0de8d80816 ("dma-buf: Drop dma_buf_k(un)map") removed map/unmap
9 handlers, but they still existed in udmabuf. Remove them there as well
10
11 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
12 Fixes: 7f0de8d80816 ("dma-buf: Drop dma_buf_k(un)map")
13 Cc: Sumit Semwal <sumit.semwal@linaro.org>
14 Cc: Daniel Vetter <daniel.vetter@intel.com>
15 Cc: linux-media@vger.kernel.org
16 Cc: linaro-mm-sig@lists.linaro.org
17 Cc: dri-devel@lists.freedesktop.org
18 Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
19 Link: https://patchwork.freedesktop.org/patch/msgid/20191126142516.630200-1-maarten.lankhorst@linux.intel.com
20 ---
21  drivers/dma-buf/udmabuf.c | 16 ----------------
22  1 file changed, 16 deletions(-)
23
24 --- a/drivers/dma-buf/udmabuf.c
25 +++ b/drivers/dma-buf/udmabuf.c
26 @@ -93,26 +93,10 @@ static void release_udmabuf(struct dma_b
27         kfree(ubuf);
28  }
29  
30 -static void *kmap_udmabuf(struct dma_buf *buf, unsigned long page_num)
31 -{
32 -       struct udmabuf *ubuf = buf->priv;
33 -       struct page *page = ubuf->pages[page_num];
34 -
35 -       return kmap(page);
36 -}
37 -
38 -static void kunmap_udmabuf(struct dma_buf *buf, unsigned long page_num,
39 -                          void *vaddr)
40 -{
41 -       kunmap(vaddr);
42 -}
43 -
44  static const struct dma_buf_ops udmabuf_ops = {
45         .map_dma_buf      = map_udmabuf,
46         .unmap_dma_buf    = unmap_udmabuf,
47         .release          = release_udmabuf,
48 -       .map              = kmap_udmabuf,
49 -       .unmap            = kunmap_udmabuf,
50         .mmap             = mmap_udmabuf,
51  };
52