Commit d09f53a7 authored by Emil Goode's avatar Emil Goode Committed by Ohad Ben-Cohen

remoteproc: Fix use of format specifyer

The dma_addr_t type can be either u32 or u64 depending on
the configuration. We should use a format specifyer for the
larger type and explicitly cast to it.

Sparse warnings:
drivers/remoteproc/remoteproc_core.c:234:2: warning:
	format ‘%x’ expects argument of type ‘unsigned int’,
	but argument 6 has type ‘dma_addr_t’ [-Wformat]

drivers/remoteproc/remoteproc_core.c:596:2: warning:
	format ‘%x’ expects argument of type ‘unsigned int’,
	but argument 5 has type ‘dma_addr_t’ [-Wformat]

drivers/remoteproc/remoteproc_core.c:634:3:
	warning: format ‘%x’ expects argument of type ‘unsigned int’,
	but argument 5 has type ‘dma_addr_t’ [-Wformat]
Signed-off-by: default avatarEmil Goode <emilgoode@gmail.com>
[fix commit log typos]
Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
parent 7168d914
...@@ -231,8 +231,8 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) ...@@ -231,8 +231,8 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
/* Store largest notifyid */ /* Store largest notifyid */
rproc->max_notifyid = max(rproc->max_notifyid, notifyid); rproc->max_notifyid = max(rproc->max_notifyid, notifyid);
dev_dbg(dev, "vring%d: va %p dma %x size %x idr %d\n", i, va, dev_dbg(dev, "vring%d: va %p dma %llx size %x idr %d\n", i, va,
dma, size, notifyid); (unsigned long long)dma, size, notifyid);
rvring->va = va; rvring->va = va;
rvring->dma = dma; rvring->dma = dma;
...@@ -586,7 +586,8 @@ static int rproc_handle_carveout(struct rproc *rproc, ...@@ -586,7 +586,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
goto free_carv; goto free_carv;
} }
dev_dbg(dev, "carveout va %p, dma %x, len 0x%x\n", va, dma, rsc->len); dev_dbg(dev, "carveout va %p, dma %llx, len 0x%x\n", va,
(unsigned long long)dma, rsc->len);
/* /*
* Ok, this is non-standard. * Ok, this is non-standard.
...@@ -631,7 +632,8 @@ static int rproc_handle_carveout(struct rproc *rproc, ...@@ -631,7 +632,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
mapping->len = rsc->len; mapping->len = rsc->len;
list_add_tail(&mapping->node, &rproc->mappings); list_add_tail(&mapping->node, &rproc->mappings);
dev_dbg(dev, "carveout mapped 0x%x to 0x%x\n", rsc->da, dma); dev_dbg(dev, "carveout mapped 0x%x to 0x%llx\n",
rsc->da, (unsigned long long)dma);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment