From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uozpo-00077U-7d for barebox@lists.infradead.org; Tue, 18 Jun 2013 17:36:49 +0000 Received: by mail-bk0-f46.google.com with SMTP id na10so1913845bkb.19 for ; Tue, 18 Jun 2013 10:36:26 -0700 (PDT) From: Sebastian Hesselbarth Date: Tue, 18 Jun 2013 19:30:05 +0200 Message-Id: <1371576607-8090-21-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1371576607-8090-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1371576607-8090-1-git-send-email-sebastian.hesselbarth@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 20/22] OF: base: remove of_find_child_by_name To: Sebastian Hesselbarth Cc: barebox@lists.infradead.org With of_get_child_by_name from Linux API, we can now convert and remove of_find_child_by_name. Signed-off-by: Sebastian Hesselbarth --- Cc: barebox@lists.infradead.org --- arch/arm/boards/at91sam9x5ek/hw_version.c | 2 +- drivers/of/base.c | 15 ++------------- drivers/of/fdt.c | 9 +++++---- include/of.h | 2 -- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/arm/boards/at91sam9x5ek/hw_version.c b/arch/arm/boards/at91sam9x5ek/hw_version.c index 426bd35..1207a3e 100644 --- a/arch/arm/boards/at91sam9x5ek/hw_version.c +++ b/arch/arm/boards/at91sam9x5ek/hw_version.c @@ -236,7 +236,7 @@ static int cm_cogent_fixup(struct device_node *root) for_each_compatible_node(node, NULL, "atmel,hsmci") { struct device_node *slotnode = - of_find_child_by_name(node, "slot"); + of_get_child_by_name(node, "slot"); if (!slotnode) continue; diff --git a/drivers/of/base.c b/drivers/of/base.c index 94a5c61..a59a1b1 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1269,7 +1269,7 @@ struct device_node *of_find_node_by_path(const char *path) if (slash) *slash = 0; - dn = of_find_child_by_name(dn, p); + dn = of_get_child_by_name(dn, p); if (!dn) goto out; @@ -1873,17 +1873,6 @@ int of_probe(void) return 0; } -struct device_node *of_find_child_by_name(struct device_node *node, const char *name) -{ - struct device_node *_n; - - device_node_for_nach_child(node, _n) - if (!of_node_cmp(_n->name, name)) - return _n; - - return NULL; -} - /** * of_create_node - create a new node including its parents * @path - the nodepath to create @@ -1908,7 +1897,7 @@ struct device_node *of_create_node(struct device_node *root, const char *path) if (slash) *slash = 0; - tmp = of_find_child_by_name(dn, p); + tmp = of_get_child_by_name(dn, p); if (tmp) dn = tmp; else diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a76396e..afaa4e0 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -61,7 +61,7 @@ struct device_node *of_unflatten_dtb(struct device_node *root, void *infdt) int len; /* length of the property */ const struct fdt_property *fdt_prop; const char *pathp, *name; - struct device_node *node = NULL, *n; + struct device_node *node = NULL; struct property *p; uint32_t dt_struct; struct fdt_node_header *fnh; @@ -135,9 +135,10 @@ struct device_node *of_unflatten_dtb(struct device_node *root, void *infdt) if (!node) { node = root; } else { - if (merge && (n = of_find_child_by_name(node, pathp))) - node = n; - else + if (merge) + node = of_get_child_by_name(node, + pathp); + if (!merge || !node) node = of_new_node(node, pathp); } diff --git a/include/of.h b/include/of.h index 0797dbe..b4e18b9 100644 --- a/include/of.h +++ b/include/of.h @@ -74,8 +74,6 @@ int of_add_initrd(struct device_node *root, resource_size_t start, int of_n_addr_cells(struct device_node *np); int of_n_size_cells(struct device_node *np); -struct device_node *of_find_child_by_name(struct device_node *node, const char *name); - struct fdt_header *fdt_get_tree(void); struct fdt_header *of_get_fixed_tree(struct device_node *node); -- 1.7.2.5 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox