fdt: Rename fdt_create_phandle to fdt_set_phandle

The old fdt_create_phandle didn't actually create a phandle it just
set one.  We'll introduce a new helper that actually does creation.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>

diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 65635e7706289aff2fdf5f6d0eaeb9ffb772cc96..418dd9d9ead246e53918a0f3108362f6803a8391 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -151,7 +151,7 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
                        dev_handle = fdt_get_phandle(blob, dev_off);
                        if (dev_handle <= 0) {
                                dev_handle = fdt_alloc_phandle(blob);
-                               ret = fdt_create_phandle(blob, dev_off,
+                               ret = fdt_set_phandle(blob, dev_off,
                                                         dev_handle);
                                if (ret < 0)
                                        return ret;

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 19b2ef6ea4bc18ccf961fe0ed075e9c5a12fa0f2..8f7323d321a39bc9fe4d2f7c457a565a5be75087 100644 (file)
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -1196,13 +1196,13 @@ int fdt_alloc_phandle(void *blob)
 }
 
 /*
- * fdt_create_phandle: Create a phandle property for the given node
+ * fdt_set_phandle: Create a phandle property for the given node
  *
  * @fdt: ptr to device tree
  * @nodeoffset: node to update
  * @phandle: phandle value to set (must be unique)
-*/
-int fdt_create_phandle(void *fdt, int nodeoffset, uint32_t phandle)
+ */
+int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle)
 {
        int ret;
 

diff --git a/include/fdt_support.h b/include/fdt_support.h
index 863024ff775d4264c2d90695d3006b217bcc7166..fdb93077035d48710abbea83b17078b353015e00 100644 (file)
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -89,7 +89,7 @@ u64 fdt_translate_address(void *blob, int node_offset, const u32 *in_addr);
 int fdt_node_offset_by_compat_reg(void *blob, const char *compat,
                                        phys_addr_t compat_off);
 int fdt_alloc_phandle(void *blob);
-int fdt_create_phandle(void *fdt, int nodeoffset, uint32_t phandle);
+int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle);
 int fdt_add_edid(void *blob, const char *compat, unsigned char *buf);
 
 int fdt_verify_alias_address(void *fdt, int anode, const char *alias,