staging: vc04_services: don't print pointers directly

kernel pointers should be printed with %pK and are not unsigned int big
on all architectures.  So fix this up to get rid of a bunch of warning
messages.

Note, there are other assumptions in this code that a pointer fits into
an int that need to be fixed up later.

Cc: Daniel Stone <daniels@collabora.com>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Pranith Kumar <bobby.prani@gmail.com>
Cc: popcornmix <popcornmix@gmail.com>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 124 insertions, 189 deletions

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 9ba0e2a7e01e..ca1fee35cc73 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -171,8 +171,8 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
         }
 
         vchiq_log_info(vchiq_arm_log_level,
-                "vchiq_init - done (slots %x, phys %pad)",
-                (unsigned int)vchiq_slot_zero, &slot_phys);
+                "vchiq_init - done (slots %pK, phys %pad)",
+                vchiq_slot_zero, &slot_phys);
 
         vchiq_call_connected_callbacks();
 
@@ -386,8 +386,8 @@ create_pagelist(char __user *buf, size_t count, unsigned short type,
                            (num_pages * sizeof(pages[0])),
                            GFP_KERNEL);
 
-        vchiq_log_trace(vchiq_arm_log_level,
-                "create_pagelist - %x", (unsigned int)pagelist);
+        vchiq_log_trace(vchiq_arm_log_level, "create_pagelist - %pK",
+                        pagelist);
         if (!pagelist)
                 return -ENOMEM;
 
@@ -511,8 +511,8 @@ free_pagelist(PAGELIST_T *pagelist, int actual)
         struct page **pages;
         unsigned int num_pages, i;
 
-        vchiq_log_trace(vchiq_arm_log_level,
-                "free_pagelist - %x, %d", (unsigned int)pagelist, actual);
+        vchiq_log_trace(vchiq_arm_log_level, "free_pagelist - %pK, %d",
+                        pagelist, actual);
 
         num_pages =
                 (pagelist->length + pagelist->offset + PAGE_SIZE - 1) /
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 47df1af2219d..5ec7c96fad33 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -418,8 +418,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         DEBUG_INITIALISE(g_state.local)
 
         vchiq_log_trace(vchiq_arm_log_level,
-                 "vchiq_ioctl - instance %x, cmd %s, arg %lx",
-                (unsigned int)instance,
+                "vchiq_ioctl - instance %pK, cmd %s, arg %lx",
+                instance,
                 ((_IOC_TYPE(cmd) == VCHIQ_IOC_MAGIC) &&
                 (_IOC_NR(cmd) <= VCHIQ_IOC_MAX)) ?
                 ioctl_names[_IOC_NR(cmd)] : "<invalid>", arg);
@@ -713,8 +713,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 break;
                         }
                         vchiq_log_info(vchiq_arm_log_level,
-                                "found bulk_waiter %x for pid %d",
-                                (unsigned int)waiter, current->pid);
+                                "found bulk_waiter %pK for pid %d", waiter,
+                                current->pid);
                         args.userdata = &waiter->bulk_waiter;
                 }
                 status = vchiq_bulk_transfer
@@ -743,8 +743,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         list_add(&waiter->list, &instance->bulk_waiter_list);
                         mutex_unlock(&instance->bulk_waiter_list_mutex);
                         vchiq_log_info(vchiq_arm_log_level,
-                                "saved bulk_waiter %x for pid %d",
-                                (unsigned int)waiter, current->pid);
+                                "saved bulk_waiter %pK for pid %d",
+                                waiter, current->pid);
 
                         if (copy_to_user((void __user *)
                                 &(((VCHIQ_QUEUE_BULK_TRANSFER_T __user *)
@@ -826,10 +826,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                         if (args.msgbufsize < msglen) {
                                                 vchiq_log_error(
                                                         vchiq_arm_log_level,
-                                                        "header %x: msgbufsize"
-                                                        " %x < msglen %x",
-                                                        (unsigned int)header,
-                                                        args.msgbufsize,
+                                                        "header %pK: msgbufsize %x < msglen %x",
+                                                        header, args.msgbufsize,
                                                         msglen);
                                                 WARN(1, "invalid message "
                                                         "size\n");
@@ -980,9 +978,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 ret = -EFAULT;
                 } else {
                         vchiq_log_error(vchiq_arm_log_level,
-                                "header %x: bufsize %x < size %x",
-                                (unsigned int)header, args.bufsize,
-                                header->size);
+                                "header %pK: bufsize %x < size %x",
+                                header, args.bufsize, header->size);
                         WARN(1, "invalid size\n");
                         ret = -EMSGSIZE;
                 }
@@ -1284,9 +1281,8 @@ vchiq_release(struct inode *inode, struct file *file)
                                         list);
                                 list_del(pos);
                                 vchiq_log_info(vchiq_arm_log_level,
-                                        "bulk_waiter - cleaned up %x "
-                                        "for pid %d",
-                                        (unsigned int)waiter, waiter->pid);
+                                        "bulk_waiter - cleaned up %pK for pid %d",
+                                        waiter, waiter->pid);
                                 kfree(waiter);
                         }
                 }
@@ -1385,9 +1381,8 @@ vchiq_dump_platform_instances(void *dump_context)
                         instance = service->instance;
                         if (instance && !instance->mark) {
                                 len = snprintf(buf, sizeof(buf),
-                                        "Instance %x: pid %d,%s completions "
-                                                "%d/%d",
-                                        (unsigned int)instance, instance->pid,
+                                        "Instance %pK: pid %d,%s completions %d/%d",
+                                        instance, instance->pid,
                                         instance->connected ? " connected, " :
                                                 "",
                                         instance->completion_insert -
@@ -1415,8 +1410,7 @@ vchiq_dump_platform_service_state(void *dump_context, VCHIQ_SERVICE_T *service)
         char buf[80];
         int len;
 
-        len = snprintf(buf, sizeof(buf), "  instance %x",
-                (unsigned int)service->instance);
+        len = snprintf(buf, sizeof(buf), "  instance %pK", service->instance);
 
         if ((service->base.callback == service_callback) &&
                 user_service->is_vchi) {
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 7ed32772997d..1254975a57bc 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -380,9 +380,9 @@ make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason,
         VCHIQ_HEADER_T *header, void *bulk_userdata)
 {
         VCHIQ_STATUS_T status;
-        vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %x, %x)",
+        vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %pK, %pK)",