Patchwork [U-Boot,1/2] fdt: Rename fdt_create_phandle to fdt_set_phandle

login
register
mail settings
Submitter Kumar Gala
Date Aug. 1, 2011, 6:23 a.m.
Message ID <1312179781-27813-2-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/107666/
State Accepted
Commit f117c0f0731e99a5e468a300a71b34afa337e133
Delegated to: Kumar Gala
Headers show

Comments

Kumar Gala - Aug. 1, 2011, 6:23 a.m.
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>
---
 arch/powerpc/cpu/mpc85xx/portals.c |    2 +-
 common/fdt_support.c               |    6 +++---
 include/fdt_support.h              |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
Jerry Van Baren - Aug. 2, 2011, 2:14 a.m.
On 08/01/2011 02:23 AM, Kumar Gala wrote:
> 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>

> ---
>   arch/powerpc/cpu/mpc85xx/portals.c |    2 +-
>   common/fdt_support.c               |    6 +++---
>   include/fdt_support.h              |    2 +-
>   3 files changed, 5 insertions(+), 5 deletions(-)

[snip]

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 65635e7..418dd9d 100644
--- 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 19b2ef6..8f7323d 100644
--- 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 863024f..fdb9307 100644
--- 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,