github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-30 19:21:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dma-heap: qcom: Replace dma_buf_map* references with iosys_map*

Browse Source 
commit 7938f42181 ("dma-buf-map: Rename to iosys-map") renames all
struct dma_buf_map variables to reflect that the mapping interface is
more generic and can be used outside of the context of DMA-BUFs.
Update the relevant struct names and associated helpers accordingly,
to fix compilation issues.

Change-Id: I2682ebe1846273c84413f3f3bff991f7397c9bcb
Signed-off-by: Chris Goldsworthy <quic_cgoldswo@quicinc.com>
This commit is contained in:
Chris Goldsworthy 2022-06-15 18:59:41 -07:00
parent d89608f45d
commit 88f5b52bd5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/dma-buf/heaps/qcom_sg_ops.c
View File

@ -14,6 +14,7 @@
* https://lore.kernel.org/lkml/20201017013255.43568-2-john.stultz@linaro.org/
*
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/dma-buf.h>
@ -456,7 +457,7 @@ static void *qcom_sg_do_vmap(struct qcom_sg_buffer *buffer)
return vaddr;
}
static int qcom_sg_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
static int qcom_sg_vmap(struct dma_buf *dmabuf, struct iosys_map *map)
{
struct qcom_sg_buffer *buffer = dmabuf->priv;
void *vaddr;
@ -471,7 +472,7 @@ static int qcom_sg_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
mutex_lock(&buffer->lock);
if (buffer->vmap_cnt) {
buffer->vmap_cnt++;
dma_buf_map_set_vaddr(map, buffer->vaddr);
iosys_map_set_vaddr(map, buffer->vaddr);
goto out;
}
@ -484,14 +485,14 @@ static int qcom_sg_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
buffer->vaddr = vaddr;
buffer->vmap_cnt++;
dma_buf_map_set_vaddr(map, buffer->vaddr);
iosys_map_set_vaddr(map, buffer->vaddr);
out:
mutex_unlock(&buffer->lock);
return ret;
}
static void qcom_sg_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
static void qcom_sg_vunmap(struct dma_buf *dmabuf, struct iosys_map *map)
{
struct qcom_sg_buffer *buffer = dmabuf->priv;
@ -502,7 +503,7 @@ static void qcom_sg_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)
}
mem_buf_vmperm_unpin(buffer->vmperm);
mutex_unlock(&buffer->lock);
dma_buf_map_clear(map);
iosys_map_clear(map);
}
static void qcom_sg_release(struct dma_buf *dmabuf)