| Message ID | 20191126142516.630200-1-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | udmabuf: Remove deleted map/unmap handlers. | expand |
On Tue, Nov 26, 2019 at 03:25:16PM +0100, Maarten Lankhorst wrote: > 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 /me puts on brown paper bag Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/dma-buf/udmabuf.c | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c > index 9635897458a0..9de539c1def4 100644 > --- a/drivers/dma-buf/udmabuf.c > +++ b/drivers/dma-buf/udmabuf.c > @@ -93,26 +93,10 @@ static void release_udmabuf(struct dma_buf *buf) > 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, > }; > > -- > 2.24.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Op 26-11-2019 om 15:36 schreef Daniel Vetter: > On Tue, Nov 26, 2019 at 03:25:16PM +0100, Maarten Lankhorst wrote: >> 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 > /me puts on brown paper bag > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Thanks, pushed. :)
diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 9635897458a0..9de539c1def4 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -93,26 +93,10 @@ static void release_udmabuf(struct dma_buf *buf) 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, };
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 --- drivers/dma-buf/udmabuf.c | 16 ---------------- 1 file changed, 16 deletions(-)