From c58495b780df374b9f2d3a7e49d658f1ede504d9 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Tue, 3 Mar 2015 15:41:13 +0000 Subject: [PATCH] xen/arm: Detect GIC nodes based on class Instead of having a list with all matches use device list to detect if a node is an interrupt controller. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9f1f59fa1e..aaa3b97584 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1035,12 +1035,6 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"), { /* sentinel */ }, }; - static const struct dt_device_match gic_matches[] __initconst = - { - DT_MATCH_GIC_V2, - DT_MATCH_GIC_V3, - { /* sentinel */ }, - }; static const struct dt_device_match timer_matches[] __initconst = { DT_MATCH_TIMER, @@ -1069,7 +1063,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, /* Replace these nodes with our own. Note that the original may be * used_by DOMID_XEN so this check comes first. */ - if ( dt_match_node(gic_matches, node) ) + if ( device_get_class(node) == DEVICE_GIC ) return make_gic_node(d, kinfo->fdt, node); if ( dt_match_node(timer_matches, node) ) return make_timer_node(d, kinfo->fdt, node); -- 2.39.5