1 files changed, 8 insertions, 13 deletions

diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 1c94824f7b63..8baf0503d92b 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -168,18 +168,15 @@ int ps3_repository_read_bus_str(unsigned int bus_index, const char *bus_str,
                 value, 0);
 }
 
-int ps3_repository_read_bus_id(unsigned int bus_index, unsigned int *bus_id)
+int ps3_repository_read_bus_id(unsigned int bus_index, u64 *bus_id)
 {
         int result;
-        u64 v1;
-        u64 v2; /* unused */
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
                 make_field("id", 0),
                 0, 0,
-                &v1, &v2);
-        *bus_id = v1;
+                bus_id, NULL);
         return result;
 }
 
@@ -225,18 +222,16 @@ int ps3_repository_read_dev_str(unsigned int bus_index,
 }
 
 int ps3_repository_read_dev_id(unsigned int bus_index, unsigned int dev_index,
-        unsigned int *dev_id)
+        u64 *dev_id)
 {
         int result;
-        u64 v1;
 
         result = read_node(PS3_LPAR_ID_PME,
                 make_first_field("bus", bus_index),
                 make_field("dev", dev_index),
                 make_field("id", 0),
                 0,
-                &v1, 0);
-        *dev_id = v1;
+                dev_id, 0);
         return result;
 }
 
@@ -332,7 +327,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
-        pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %u, num_dev %u\n",
+        pr_debug("%s:%d: bus_type %u, bus_index %u, bus_id %lu, num_dev %u\n",
                 __func__, __LINE__, tmp.bus_type, tmp.bus_index, tmp.bus_id,
                 num_dev);
 
@@ -387,7 +382,7 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
-        pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %u\n",
+        pr_debug("%s:%d: found: dev_type %u, dev_index %u, dev_id %lu\n",
                 __func__, __LINE__, tmp.dev_type, tmp.dev_index, tmp.dev_id);
 
         *repo = tmp;
@@ -1034,7 +1029,7 @@ static int dump_device_info(struct ps3_repository_device *repo,
                         continue;
                 }
 
-                pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %u\n", __func__,
+                pr_debug("%s:%d  (%u:%u): dev_type %u, dev_id %lu\n", __func__,
                         __LINE__, repo->bus_index, repo->dev_index,
                         repo->dev_type, repo->dev_id);
 
@@ -1091,7 +1086,7 @@ int ps3_repository_dump_bus_info(void)
                         continue;
                 }
 
-                pr_debug("%s:%d bus_%u: bus_type %u, bus_id %u, num_dev %u\n",
+                pr_debug("%s:%d bus_%u: bus_type %u, bus_id %lu, num_dev %u\n",
                         __func__, __LINE__, repo.bus_index, repo.bus_type,
                         repo.bus_id, num_dev);