All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ian Campbell <ian.campbell@citrix.com>,
	stefano.stabellini@eu.citrix.com,
	Naresh Bhat <naresh.bhat@linaro.org>,
	julien.grall@linaro.org, tim@xen.org,
	Roy Franz <roy.franz@linaro.org>, Fu Wei <fu.wei@linaro.org>
Subject: [PATCH 09/10] xen: arm: Drop device_tree_node_compatible
Date: Mon, 16 Jun 2014 12:45:02 +0100	[thread overview]
Message-ID: <1402919103-29642-9-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1402919079.14907.22.camel@kazak.uk.xensource.com>

Instead use fdt_node_check_compatible from libfdt.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/arch/arm/bootfdt.c |   28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c
index a80055c..8ab45c9 100644
--- a/xen/arch/arm/bootfdt.c
+++ b/xen/arch/arm/bootfdt.c
@@ -31,30 +31,6 @@ static bool_t __init device_tree_node_matches(const void *fdt, int node,
         && (name[match_len] == '@' || name[match_len] == '\0');
 }
 
-static bool_t __init device_tree_node_compatible(const void *fdt, int node,
-                                                 const char *match)
-{
-    int len, l;
-    int mlen;
-    const void *prop;
-
-    mlen = strlen(match);
-
-    prop = fdt_getprop(fdt, node, "compatible", &len);
-    if ( prop == NULL )
-        return 0;
-
-    while ( len > 0 ) {
-        if ( !dt_compat_cmp(prop, match) )
-            return 1;
-        l = strlen(prop) + 1;
-        prop += l;
-        len -= l;
-    }
-
-    return 0;
-}
-
 static void __init device_tree_get_reg(const __be32 **cell, u32 address_cells,
                                        u32 size_cells, u64 *start, u64 *size)
 {
@@ -261,8 +237,8 @@ static int __init early_scan_node(const void *fdt,
 {
     if ( device_tree_node_matches(fdt, node, "memory") )
         process_memory_node(fdt, node, name, address_cells, size_cells);
-    else if ( device_tree_node_compatible(fdt, node, "xen,multiboot-module" ) ||
-              device_tree_node_compatible(fdt, node, "multiboot,module" ))
+    else if ( fdt_node_check_compatible(fdt, node, "xen,multiboot-module" ) ||
+              fdt_node_check_compatible(fdt, node, "multiboot,module" ))
         process_multiboot_node(fdt, node, name, address_cells, size_cells);
     else if ( depth == 1 && device_tree_node_matches(fdt, node, "chosen") )
         process_chosen_node(fdt, node, name, address_cells, size_cells);
-- 
1.7.10.4

  parent reply	other threads:[~2014-06-16 11:45 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-16 11:44 [PATCH 00/10] xen: arm: Refactor/improve early DT parsing and multiboot module support Ian Campbell
2014-06-16 11:44 ` [PATCH 01/10] xen: arm: implement generic multiboot compatibility strings Ian Campbell
2014-06-16 11:44 ` [PATCH 02/10] xen: arm: /chosen/module@N/bootargs bootprotcol node is not deprecated Ian Campbell
2014-06-16 11:44 ` [PATCH 03/10] xen: arm: prefer typesafe max()/min() over MAX()/MIN() Ian Campbell
2014-06-16 12:08   ` Julien Grall
2014-06-16 11:44 ` [PATCH 04/10] xen: arm: rename early_info structs Ian Campbell
2014-06-16 12:10   ` Julien Grall
2014-06-18 13:56   ` Stefano Stabellini
2014-06-16 11:44 ` [PATCH 05/10] xen: arm: move boot time fdt parsing into separate file Ian Campbell
2014-06-16 12:13   ` Julien Grall
2014-06-18 14:00   ` Stefano Stabellini
2014-06-16 11:44 ` [PATCH 06/10] xen: arm: device_tree_bootargs to bootfdt.c, renaming to boot_fdt_cmdline Ian Campbell
2014-06-16 12:32   ` Julien Grall
2014-06-18 14:02   ` Stefano Stabellini
2014-06-16 11:45 ` [PATCH 07/10] xen: arm: store per-boot module type instead of relying on index Ian Campbell
2014-06-16 12:48   ` Julien Grall
2014-06-16 12:52     ` Ian Campbell
2014-06-18 14:18   ` Stefano Stabellini
2014-06-16 11:45 ` [PATCH 08/10] xen: arm: support bootmodule type detection by ordering Ian Campbell
2014-06-18 14:40   ` Stefano Stabellini
2014-06-18 14:45     ` Ian Campbell
2014-06-18 15:19       ` Stefano Stabellini
2014-06-16 11:45 ` Ian Campbell [this message]
2014-06-18 14:43   ` [PATCH 09/10] xen: arm: Drop device_tree_node_compatible Stefano Stabellini
2014-06-18 14:47     ` Ian Campbell
2014-06-18 14:57       ` Julien Grall
2014-06-18 14:59         ` Stefano Stabellini
2014-06-18 15:20         ` Ian Campbell
2014-06-16 11:45 ` [PATCH 10/10] xen: arm: update multiboot device tree bindings Ian Campbell
2014-06-18 14:56   ` Stefano Stabellini
2014-06-18 15:17     ` Ian Campbell
2014-06-18 15:22       ` Stefano Stabellini
2014-06-18 15:24         ` Ian Campbell
2014-07-15 18:22 ` [PATCH 00/10] xen: arm: Refactor/improve early DT parsing and multiboot module support Roy Franz
2014-07-16  8:31   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402919103-29642-9-git-send-email-ian.campbell@citrix.com \
    --to=ian.campbell@citrix.com \
    --cc=fu.wei@linaro.org \
    --cc=julien.grall@linaro.org \
    --cc=naresh.bhat@linaro.org \
    --cc=roy.franz@linaro.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tim@xen.org \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.