* [PATCH] udmabuf: Remove deleted map/unmap handlers.
@ 2019-11-26 14:25 Maarten Lankhorst
2019-11-26 14:36 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Maarten Lankhorst @ 2019-11-26 14:25 UTC (permalink / raw)
To: dri-devel
Cc: Maarten Lankhorst, Sumit Semwal, Daniel Vetter, linux-media,
linaro-mm-sig
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] udmabuf: Remove deleted map/unmap handlers.
2019-11-26 14:25 [PATCH] udmabuf: Remove deleted map/unmap handlers Maarten Lankhorst
@ 2019-11-26 14:36 ` Daniel Vetter
2019-11-26 14:44 ` Maarten Lankhorst
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2019-11-26 14:36 UTC (permalink / raw)
To: Maarten Lankhorst; +Cc: dri-devel, linaro-mm-sig, Daniel Vetter, linux-media
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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] udmabuf: Remove deleted map/unmap handlers.
2019-11-26 14:36 ` Daniel Vetter
@ 2019-11-26 14:44 ` Maarten Lankhorst
0 siblings, 0 replies; 3+ messages in thread
From: Maarten Lankhorst @ 2019-11-26 14:44 UTC (permalink / raw)
To: Daniel Vetter; +Cc: dri-devel, linaro-mm-sig, Daniel Vetter, linux-media
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. :)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-26 14:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-26 14:25 [PATCH] udmabuf: Remove deleted map/unmap handlers Maarten Lankhorst
2019-11-26 14:36 ` Daniel Vetter
2019-11-26 14:44 ` Maarten Lankhorst
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).