From: Jon Medhurst <tixy@linaro.org>
Date: Tue, 4 Mar 2014 18:10:17 +0000 (+0100)
Subject: drm/cma: Fix printk formats in drm_gem_cma_describe
X-Git-Tag: firefly_0821_release~3680^2~10^2~1^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12df7b1b7e3dec1b6691b678702bb0bdae8fa578;p=firefly-linux-kernel-4.4.55.git

drm/cma: Fix printk formats in drm_gem_cma_describe

This fixes the following warnings when building for arm64...

drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_descr    ibe’:
drivers/gpu/drm/drm_gem_cma_helper.c:273:4: warning: format ‘%Zx’ expects argument of type ‘size_t’, but argument 6 has type ‘dma_addr_t’ [-Wformat=]
    off, cma_obj->paddr, cma_obj->vaddr, obj->size);
    ^
drivers/gpu/drm/drm_gem_cma_helper.c:273:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 8 has type ‘size_t’ [-Wformat=]

Signed-off-by: Jon Medhurst <tixy@linaro.org>
---

diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 0a7e011509bd..c25b7a0eb0e3 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -262,9 +262,9 @@ void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj, struct seq_file *m
 	if (obj->map_list.map)
 		off = (uint64_t)obj->map_list.hash.key;
 
-	seq_printf(m, "%2d (%2d) %08llx %08Zx %p %d",
+	seq_printf(m, "%2d (%2d) %08llx %pad %p %zd",
 			obj->name, obj->refcount.refcount.counter,
-			off, cma_obj->paddr, cma_obj->vaddr, obj->size);
+			off, &cma_obj->paddr, cma_obj->vaddr, obj->size);
 
 	seq_printf(m, "\n");
 }