| Message ID | 1377701263-3319-16-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Wed, 2013-08-28 at 15:47 +0100, Julien Grall wrote: > 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> > > --- > Changes in v2: > - Move skip_match and timer_ids within the appropriate functions > --- > xen/arch/arm/domain_build.c | 13 ++++++++++--- > xen/arch/arm/time.c | 10 +++++++--- > 2 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index 345f0f7..eb8b662 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -437,15 +437,22 @@ 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 9c176cd..8125b92 100644 > --- a/xen/arch/arm/time.c > +++ b/xen/arch/arm/time.c > @@ -101,14 +101,18 @@ 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_COMPATIBLE("arm,armv7-timer"), > + DT_MATCH_COMPATIBLE("arm,armv8-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"); >
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 345f0f7..eb8b662 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -437,15 +437,22 @@ 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 9c176cd..8125b92 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -101,14 +101,18 @@ 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_COMPATIBLE("arm,armv7-timer"), + DT_MATCH_COMPATIBLE("arm,armv8-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");
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> --- Changes in v2: - Move skip_match and timer_ids within the appropriate functions --- xen/arch/arm/domain_build.c | 13 ++++++++++--- xen/arch/arm/time.c | 10 +++++++--- 2 files changed, 17 insertions(+), 6 deletions(-)