1 files changed, 27 insertions, 28 deletions

diff --git a/arch/powerpc/boot/libfdt/fdt_sw.c b/arch/powerpc/boot/libfdt/fdt_sw.c
index dda2de34b2e0..698329e0ccaf 100644
--- a/arch/powerpc/boot/libfdt/fdt_sw.c
+++ b/arch/powerpc/boot/libfdt/fdt_sw.c
@@ -55,14 +55,22 @@
 
 #include "libfdt_internal.h"
 
-static int check_header_sw(void *fdt)
+static int _fdt_sw_check_header(void *fdt)
 {
-        if (fdt_magic(fdt) != SW_MAGIC)
+        if (fdt_magic(fdt) != FDT_SW_MAGIC)
                 return -FDT_ERR_BADMAGIC;
+        /* FIXME: should check more details about the header state */
         return 0;
 }
 
-static void *grab_space(void *fdt, int len)
+#define FDT_SW_CHECK_HEADER(fdt) \
+        { \
+                int err; \
+                if ((err = _fdt_sw_check_header(fdt)) != 0) \
+                        return err; \
+        }
+
+static void *_fdt_grab_space(void *fdt, int len)
 {
         int offset = fdt_size_dt_struct(fdt);
         int spaceleft;
@@ -86,13 +94,13 @@ int fdt_create(void *buf, int bufsize)
 
         memset(buf, 0, bufsize);
 
-        fdt_set_magic(fdt, SW_MAGIC);
+        fdt_set_magic(fdt, FDT_SW_MAGIC);
         fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);
         fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);
         fdt_set_totalsize(fdt,  bufsize);
 
-        fdt_set_off_mem_rsvmap(fdt, ALIGN(sizeof(struct fdt_header),
-                                          sizeof(struct fdt_reserve_entry)));
+        fdt_set_off_mem_rsvmap(fdt, FDT_ALIGN(sizeof(struct fdt_header),
+                                              sizeof(struct fdt_reserve_entry)));
         fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));
         fdt_set_off_dt_strings(fdt, bufsize);
 
@@ -102,11 +110,10 @@ int fdt_create(void *buf, int bufsize)
 int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
 {
         struct fdt_reserve_entry *re;
-        int err = check_header_sw(fdt);
         int offset;
 
-        if (err)
-                return err;
+        FDT_SW_CHECK_HEADER(fdt);
+
         if (fdt_size_dt_struct(fdt))
                 return -FDT_ERR_BADSTATE;
 
@@ -114,7 +121,7 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
         if ((offset + sizeof(*re)) > fdt_totalsize(fdt))
                 return -FDT_ERR_NOSPACE;
 
-        re = (struct fdt_reserve_entry *)(fdt + offset);
+        re = (struct fdt_reserve_entry *)((char *)fdt + offset);
         re->address = cpu_to_fdt64(addr);
         re->size = cpu_to_fdt64(size);
 
@@ -131,13 +138,11 @@ int fdt_finish_reservemap(void *fdt)
 int fdt_begin_node(void *fdt, const char *name)
 {
         struct fdt_node_header *nh;
-        int err = check_header_sw(fdt);
         int namelen = strlen(name) + 1;
 
-        if (err)
-                return err;
+        FDT_SW_CHECK_HEADER(fdt);
 
-        nh = grab_space(fdt, sizeof(*nh) + ALIGN(namelen, FDT_TAGSIZE));
+        nh = _fdt_grab_space(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));
         if (! nh)
                 return -FDT_ERR_NOSPACE;
 
@@ -149,12 +154,10 @@ int fdt_begin_node(void *fdt, const char *name)
 int fdt_end_node(void *fdt)
 {
         uint32_t *en;
-        int err = check_header_sw(fdt);
 
-        if (err)
-                return err;
+        FDT_SW_CHECK_HEADER(fdt);
 
-        en = grab_space(fdt, FDT_TAGSIZE);
+        en = _fdt_grab_space(fdt, FDT_TAGSIZE);
         if (! en)
                 return -FDT_ERR_NOSPACE;
 
@@ -162,7 +165,7 @@ int fdt_end_node(void *fdt)
         return 0;
 }
 
-static int find_add_string(void *fdt, const char *s)
+static int _fdt_find_add_string(void *fdt, const char *s)
 {
         char *strtab = (char *)fdt + fdt_totalsize(fdt);
         const char *p;
@@ -188,17 +191,15 @@ static int find_add_string(void *fdt, const char *s)
 int fdt_property(void *fdt, const char *name, const void *val, int len)
 {
         struct fdt_property *prop;
-        int err = check_header_sw(fdt);
         int nameoff;
 
-        if (err)
-                return err;
+        FDT_SW_CHECK_HEADER(fdt);
 
-        nameoff = find_add_string(fdt, name);
+        nameoff = _fdt_find_add_string(fdt, name);
         if (nameoff == 0)
                 return -FDT_ERR_NOSPACE;
 
-        prop = grab_space(fdt, sizeof(*prop) + ALIGN(len, FDT_TAGSIZE));
+        prop = _fdt_grab_space(fdt, sizeof(*prop) + FDT_TAGALIGN(len));
         if (! prop)
                 return -FDT_ERR_NOSPACE;
 
@@ -211,18 +212,16 @@ int fdt_property(void *fdt, const char *name, const void *val, int len)
 
 int fdt_finish(void *fdt)
 {
-        int err = check_header_sw(fdt);
         char *p = (char *)fdt;
         uint32_t *end;
         int oldstroffset, newstroffset;
         uint32_t tag;
         int offset, nextoffset;
 
-        if (err)
-                return err;
+        FDT_SW_CHECK_HEADER(fdt);
 
         /* Add terminator */
-        end = grab_space(fdt, sizeof(*end));
+        end = _fdt_grab_space(fdt, sizeof(*end));
         if (! end)
                 return -FDT_ERR_NOSPACE;
         *end = cpu_to_fdt32(FDT_END);