diff options
author | Julien Grall <julien.grall@linaro.org> | 2013-09-13 13:49:18 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2013-09-17 15:28:18 +0100 |
commit | d90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b (patch) | |
tree | 7a9b8da8e525ad47b179aa00b33b4bdd506e9b53 /xen/arch/arm | |
parent | 34743911e7a49f424fc2e92b5148e411aae8e71c (diff) | |
download | xen-d90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b.tar.gz xen-d90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b.tar.bz2 xen-d90abf9aa6aea90f2ffe402ca3bad8e6fdb9ef1b.zip |
xen/arm: Use dt_device_match to avoid multiple if conditions
There is some place in Xen ARM code where multiple if conditions is used
check the presence of a node or find a node.
These pieces of code can be replace by an array and using proper device tree
helpers.
Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen/arch/arm')
-rw-r--r-- | xen/arch/arm/domain_build.c | 11 | ||||
-rw-r--r-- | xen/arch/arm/time.c | 9 |
2 files changed, 14 insertions, 6 deletions
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index bde041ed07..8ebe1bc3df 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -437,15 +437,20 @@ static int map_device(struct domain *d, const struct dt_device_node *dev) static int handle_node(struct domain *d, const struct dt_device_node *np) { + static const struct dt_device_match skip_matches[] __initconst = + { + DT_MATCH_COMPATIBLE("xen,xen"), + DT_MATCH_TYPE("memory"), + DT_MATCH_PATH("/chosen"), + { /* sentinel */ }, + }; const struct dt_device_node *child; int res; DPRINT("handle %s\n", dt_node_full_name(np)); /* Skip theses nodes and the sub-nodes */ - if ( dt_device_is_compatible(np, "xen,xen") || - dt_device_type_is_equal(np, "memory") || - !strcmp("/chosen", dt_node_full_name(np)) ) + if ( dt_match_node(skip_matches, np ) ) return 0; if ( dt_device_used_by(np) != DOMID_XEN ) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 9c176cd483..eb3ad5c6fe 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -101,14 +101,17 @@ static uint32_t calibrate_timer(void) /* Set up the timer on the boot CPU */ int __init init_xen_time(void) { + static const struct dt_device_match timer_ids[] __initconst = + { + DT_MATCH_TIMER, + { /* sentinel */ }, + }; struct dt_device_node *dev; int res; unsigned int i; u32 rate; - dev = dt_find_compatible_node(NULL, NULL, "arm,armv7-timer"); - if ( !dev ) - dev = dt_find_compatible_node(NULL, NULL, "arm,armv8-timer"); + dev = dt_find_matching_node(NULL, timer_ids); if ( !dev ) panic("Unable to find a compatible timer in the device tree\n"); |