1 files changed, 2 insertions, 17 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index bf2005b2feb6..eb913f80bfb1 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -757,24 +757,9 @@ static int __init early_init_dt_scan_root(unsigned long node,
 static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp)
 {
         cell_t *p = *cellp;
-        unsigned long r;
 
-        /* Ignore more than 2 cells */
-        while (s > sizeof(unsigned long) / 4) {
-                p++;
-                s--;
-        }
-        r = *p++;
-#ifdef CONFIG_PPC64
-        if (s > 1) {
-                r <<= 32;
-                r |= *(p++);
-                s--;
-        }
-#endif
-
-        *cellp = p;
-        return r;
+        *cellp = p + s;
+        return of_read_ulong(p, s);
 }