diff options
author | Magnus Damm <damm+renesas@opensource.se> | 2015-05-04 10:16:19 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 01:45:49 -0400 |
commit | 30c4cf3b53b4a09ca24603dd3c3119433e8ac9d5 (patch) | |
tree | ede8221f8dabae2e329b802fbea4b3c9a86a3b54 | |
parent | 712a0dd91c4a5936fa00a24fa4e0100f982ad516 (diff) |
drm/cma: Fix 64-bit size_t build warnings
Fix warnings related to size_t when building for 64-bit architectures:
drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_create’:
drivers/gpu/drm/drm_gem_cma_helper.c:114:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Wformat=]
size);
^
drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_describe’:
drivers/gpu/drm/drm_gem_cma_helper.c:393:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 8 has type ‘size_t’ [-Wformat=]
off, &cma_obj->paddr, cma_obj->vaddr, obj->size);
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/drm_gem_cma_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index e419eedf751d..bd75f303da63 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c | |||
@@ -110,7 +110,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, | |||
110 | cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size, | 110 | cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size, |
111 | &cma_obj->paddr, GFP_KERNEL | __GFP_NOWARN); | 111 | &cma_obj->paddr, GFP_KERNEL | __GFP_NOWARN); |
112 | if (!cma_obj->vaddr) { | 112 | if (!cma_obj->vaddr) { |
113 | dev_err(drm->dev, "failed to allocate buffer with size %d\n", | 113 | dev_err(drm->dev, "failed to allocate buffer with size %zu\n", |
114 | size); | 114 | size); |
115 | ret = -ENOMEM; | 115 | ret = -ENOMEM; |
116 | goto error; | 116 | goto error; |
@@ -388,7 +388,7 @@ void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj, | |||
388 | 388 | ||
389 | off = drm_vma_node_start(&obj->vma_node); | 389 | off = drm_vma_node_start(&obj->vma_node); |
390 | 390 | ||
391 | seq_printf(m, "%2d (%2d) %08llx %pad %p %d", | 391 | seq_printf(m, "%2d (%2d) %08llx %pad %p %zu", |
392 | obj->name, obj->refcount.refcount.counter, | 392 | obj->name, obj->refcount.refcount.counter, |
393 | off, &cma_obj->paddr, cma_obj->vaddr, obj->size); | 393 | off, &cma_obj->paddr, cma_obj->vaddr, obj->size); |
394 | 394 | ||