This patch modifies arch-specific irq_domain_ops.match functions to use the new function prototype.
Signed-off-by: Suravee Suthikulpanit Suravee.Suthikulpanit@amd.com --- arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 4 +++- arch/powerpc/platforms/cell/interrupt.c | 4 +++- arch/powerpc/platforms/powermac/pic.c | 4 +++- arch/powerpc/platforms/ps3/interrupt.c | 4 +++- arch/powerpc/sysdev/ehv_pic.c | 4 +++- arch/powerpc/sysdev/i8259.c | 4 +++- arch/powerpc/sysdev/ipic.c | 4 +++- arch/powerpc/sysdev/mpic.c | 4 +++- arch/powerpc/sysdev/qe_lib/qe_ic.c | 4 +++- arch/powerpc/sysdev/xics/xics-common.c | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c index ca3a062..17619e5 100644 --- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c +++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c @@ -123,8 +123,10 @@ cpld_pic_cascade(unsigned int irq, struct irq_desc *desc) }
static int -cpld_pic_host_match(struct irq_domain *h, struct device_node *node) +cpld_pic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); return cpld_pic_node == node; }
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c index 3af8324..178801d 100644 --- a/arch/powerpc/platforms/cell/interrupt.c +++ b/arch/powerpc/platforms/cell/interrupt.c @@ -222,8 +222,10 @@ void iic_request_IPIs(void) #endif /* CONFIG_SMP */
-static int iic_host_match(struct irq_domain *h, struct device_node *node) +static int iic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); return of_device_is_compatible(node, "IBM,CBEA-Internal-Interrupt-Controller"); } diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index 59cfc9d..2314c13 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c @@ -268,8 +268,10 @@ static struct irqaction gatwick_cascade_action = { .name = "cascade", };
-static int pmac_pic_host_match(struct irq_domain *h, struct device_node *node) +static int pmac_pic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); /* We match all, we don't always have a node anyway */ return 1; } diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index a6c42f3..7235e07 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c @@ -678,8 +678,10 @@ static int ps3_host_map(struct irq_domain *h, unsigned int virq, return 0; }
-static int ps3_host_match(struct irq_domain *h, struct device_node *np) +static int ps3_host_match(struct irq_domain *h, + enum irq_domain_data_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); /* Match all */ return 1; } diff --git a/arch/powerpc/sysdev/ehv_pic.c b/arch/powerpc/sysdev/ehv_pic.c index 2d20f10..46638cf 100644 --- a/arch/powerpc/sysdev/ehv_pic.c +++ b/arch/powerpc/sysdev/ehv_pic.c @@ -177,8 +177,10 @@ unsigned int ehv_pic_get_irq(void) return irq_linear_revmap(global_ehv_pic->irqhost, irq); }
-static int ehv_pic_host_match(struct irq_domain *h, struct device_node *node) +static int ehv_pic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); /* Exact match, unless ehv_pic node is NULL */ return h->of_node == NULL || h->of_node == node; } diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c index 31c3347..eec44a6 100644 --- a/arch/powerpc/sysdev/i8259.c +++ b/arch/powerpc/sysdev/i8259.c @@ -162,8 +162,10 @@ static struct resource pic_edgectrl_iores = { .flags = IORESOURCE_BUSY, };
-static int i8259_host_match(struct irq_domain *h, struct device_node *node) +static int i8259_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); return h->of_node == NULL || h->of_node == node; }
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index d78f136..77c255f 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -671,8 +671,10 @@ static struct irq_chip ipic_edge_irq_chip = { .irq_set_type = ipic_set_irq_type, };
-static int ipic_host_match(struct irq_domain *h, struct device_node *node) +static int ipic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); /* Exact match, unless ipic node is NULL */ return h->of_node == NULL || h->of_node == node; } diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index c8e7333..aef4cd5 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1007,8 +1007,10 @@ static struct irq_chip mpic_irq_ht_chip = { #endif /* CONFIG_MPIC_U3_HT_IRQS */
-static int mpic_host_match(struct irq_domain *h, struct device_node *node) +static int mpic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); /* Exact match, unless mpic node is NULL */ return h->of_node == NULL || h->of_node == node; } diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c index 6512cd8..c0d1787 100644 --- a/arch/powerpc/sysdev/qe_lib/qe_ic.c +++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c @@ -244,8 +244,10 @@ static struct irq_chip qe_ic_irq_chip = { .irq_mask_ack = qe_ic_mask_irq, };
-static int qe_ic_host_match(struct irq_domain *h, struct device_node *node) +static int qe_ic_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { + WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); /* Exact match, unless qe_ic node is NULL */ return h->of_node == NULL || h->of_node == node; } diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c index 08c248e..36023f0 100644 --- a/arch/powerpc/sysdev/xics/xics-common.c +++ b/arch/powerpc/sysdev/xics/xics-common.c @@ -298,10 +298,12 @@ int xics_get_irq_server(unsigned int virq, const struct cpumask *cpumask, } #endif /* CONFIG_SMP */
-static int xics_host_match(struct irq_domain *h, struct device_node *node) +static int xics_host_match(struct irq_domain *h, + enum irq_domain_ref_type type, void *node) { struct ics *ics;
+ WARN_ON(type != IRQ_DOMAIN_REF_OF_DEV_NODE); list_for_each_entry(ics, &ics_list, link) if (ics->host_match(ics, node)) return 1;