From 8ddb10eae0c0e6936c69b19c21aaa2f6e0433717 Mon Sep 17 00:00:00 2001 From: Chunhe Lan Date: Wed, 31 Aug 2011 10:36:32 +0800 Subject: fdt: Add a do_fixup_by_path_string() function The do_fixup_by_path_string() will set the specified node's property to the value contained in "status". It would just be an inline wrapper for do_fixup_by_path() that calls strlen on the argument. Signed-off-by: Chunhe Lan --- include/fdt_support.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/fdt_support.h') diff --git a/include/fdt_support.h b/include/fdt_support.h index 8f06aac..0091dc3 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -36,6 +36,13 @@ void do_fixup_by_path(void *fdt, const char *path, const char *prop, const void *val, int len, int create); void do_fixup_by_path_u32(void *fdt, const char *path, const char *prop, u32 val, int create); + +static inline void do_fixup_by_path_string(void *fdt, const char *path, + const char *prop, const char *status) +{ + do_fixup_by_path(fdt, path, prop, status, strlen(status) + 1, 1); +} + void do_fixup_by_prop(void *fdt, const char *pname, const void *pval, int plen, const char *prop, const void *val, int len, -- cgit v1.1 From 3c927cccdc930e15cc993e27ac3bee8e15682423 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Tue, 20 Sep 2011 18:24:34 -0500 Subject: fdt: check for fdt errors in fdt_create_phandle fdt_create_phandle() was ignoring errors from fdt_set_phandle(). If an error occurs, print an error message and return 0, which is an invalid phandle. We also need to change the return type for fdt_create_phandle() to indicate that it cannot return an error code. Signed-off-by: Timur Tabi --- include/fdt_support.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/fdt_support.h') diff --git a/include/fdt_support.h b/include/fdt_support.h index 0091dc3..4826eee 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -97,7 +97,7 @@ 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_set_phandle(void *fdt, int nodeoffset, uint32_t phandle); -int fdt_create_phandle(void *fdt, int nodeoffset); +unsigned int fdt_create_phandle(void *fdt, int nodeoffset); int fdt_add_edid(void *blob, const char *compat, unsigned char *buf); int fdt_verify_alias_address(void *fdt, int anode, const char *alias, -- cgit v1.1