diff options
| author | Tzung-Bi Shih <[email protected]> | 2020-11-16 16:25:37 +0800 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2020-11-20 21:45:10 -0600 |
| commit | 903635cbc75763a5ce78db60934494dd51a66778 (patch) | |
| tree | 257db9b462a41cb318aeff7f630b22e3fa7716e6 | |
| parent | 778f2664fa34634001c51f46bc64c6e9ef91611a (diff) | |
remoteproc/mediatek: fix sparse errors on dma_alloc and dma_free
Fixes the following sparse errors on dma_alloc_coherent() and
dma_free_coherent().
On drivers/remoteproc/mtk_scp.c:559:23:
warning: incorrect type in assignment (different address spaces)
expected void [noderef] __iomem *cpu_addr
got void *
On drivers/remoteproc/mtk_scp.c:572:56:
warning: incorrect type in argument 3 (different address spaces)
expected void *cpu_addr
got void [noderef] __iomem *cpu_addr
The cpu_addr is not a __iomem address. Removes the marker.
Reviewed-by: Nicolas Boichat <[email protected]>
Reviewed-by: Mathieu Poirier <[email protected]>
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Tzung-Bi Shih <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Bjorn Andersson <[email protected]>
| -rw-r--r-- | drivers/remoteproc/mtk_common.h | 2 | ||||
| -rw-r--r-- | drivers/remoteproc/mtk_scp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h index 47b4561443a9..b3397d327786 100644 --- a/drivers/remoteproc/mtk_common.h +++ b/drivers/remoteproc/mtk_common.h @@ -99,7 +99,7 @@ struct mtk_scp { bool ipi_id_ack[SCP_IPI_MAX]; wait_queue_head_t ack_wq; - void __iomem *cpu_addr; + void *cpu_addr; dma_addr_t dma_addr; size_t dram_size; diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index 8ed89ea1eb78..a1e23b5f19b9 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -413,7 +413,7 @@ static void *scp_da_to_va(struct rproc *rproc, u64 da, size_t len) } else if (scp->dram_size) { offset = da - scp->dma_addr; if (offset >= 0 && (offset + len) < scp->dram_size) - return (void __force *)scp->cpu_addr + offset; + return scp->cpu_addr + offset; } return NULL; |