diff options
| author | Emil Goode <emilgoode@gmail.com> | 2012-09-28 17:35:06 +0200 |
|---|---|---|
| committer | Ohad Ben-Cohen <ohad@wizery.com> | 2012-10-02 10:14:43 +0200 |
| commit | d09f53a735bae43806a77754312a45d3f1198342 (patch) | |
| tree | 9fee166f4ee51906db2ff787c3f7453837f0b563 | |
| parent | remoteproc: fix a potential NULL-dereference on cleanup (diff) | |
| download | linux-d09f53a735bae43806a77754312a45d3f1198342.tar.xz linux-d09f53a735bae43806a77754312a45d3f1198342.zip | |
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: Emil Goode <emilgoode@gmail.com>
[fix commit log typos]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
| -rw-r--r-- | drivers/remoteproc/remoteproc_core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index f163704b6ce5..dd3bfaf1ad40 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -231,8 +231,8 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) /* Store largest 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, - dma, size, notifyid); + dev_dbg(dev, "vring%d: va %p dma %llx size %x idr %d\n", i, va, + (unsigned long long)dma, size, notifyid); rvring->va = va; rvring->dma = dma; @@ -586,7 +586,8 @@ static int rproc_handle_carveout(struct rproc *rproc, 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. @@ -631,7 +632,8 @@ static int rproc_handle_carveout(struct rproc *rproc, mapping->len = rsc->len; 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); } /* |