@@ -124,7 +124,7 @@ cpld_pic_cascade(unsigned int irq, struct irq_desc *desc)
static int
cpld_pic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
return cpld_pic_node == node;
}
@@ -223,7 +223,7 @@ void iic_request_IPIs(void)
static int iic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
return of_device_is_compatible(node,
"IBM,CBEA-Internal-Interrupt-Controller");
@@ -109,7 +109,8 @@ static int flipper_pic_map(struct irq_domain *h, unsigned int virq,
}
static int flipper_pic_match(struct irq_domain *h, struct device_node *np,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token,
+ void *bus_data)
{
return 1;
}
@@ -269,7 +269,8 @@ static struct irqaction gatwick_cascade_action = {
};
static int pmac_pic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token,
+ void *bus_data)
{
/* We match all, we don't always have a node anyway */
return 1;
@@ -135,7 +135,7 @@ static void opal_handle_irq_work(struct irq_work *work)
}
static int opal_event_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
return h->of_node == node;
}
@@ -679,7 +679,7 @@ static int ps3_host_map(struct irq_domain *h, unsigned int virq,
}
static int ps3_host_match(struct irq_domain *h, struct device_node *np,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
/* Match all */
return 1;
@@ -178,7 +178,8 @@ unsigned int ehv_pic_get_irq(void)
}
static int ehv_pic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token,
+ void *bus_data)
{
/* Exact match, unless ehv_pic node is NULL */
return h->of_node == NULL || h->of_node == node;
@@ -163,7 +163,7 @@ static struct resource pic_edgectrl_iores = {
};
static int i8259_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
return h->of_node == NULL || h->of_node == node;
}
@@ -672,7 +672,7 @@ static struct irq_chip ipic_edge_irq_chip = {
};
static int ipic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
/* Exact match, unless ipic node is NULL */
return h->of_node == NULL || h->of_node == node;
@@ -1008,7 +1008,7 @@ static struct irq_chip mpic_irq_ht_chip = {
static int mpic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
/* Exact match, unless mpic node is NULL */
return h->of_node == NULL || h->of_node == node;
@@ -245,7 +245,7 @@ static struct irq_chip qe_ic_irq_chip = {
};
static int qe_ic_host_match(struct irq_domain *h, struct device_node *node,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
/* Exact match, unless qe_ic node is NULL */
return h->of_node == NULL || h->of_node == node;
@@ -299,7 +299,7 @@ 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,
- enum irq_domain_bus_token bus_token)
+ enum irq_domain_bus_token bus_token, void *bus_data)
{
struct ics *ics;
@@ -76,7 +76,7 @@ enum irq_domain_bus_token {
*/
struct irq_domain_ops {
int (*match)(struct irq_domain *d, struct device_node *node,
- enum irq_domain_bus_token bus_token);
+ enum irq_domain_bus_token bus_token, void *bus_data);
int (*map)(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw);
void (*unmap)(struct irq_domain *d, unsigned int virq);
int (*xlate)(struct irq_domain *d, struct device_node *node,
@@ -209,7 +209,7 @@ struct irq_domain *irq_find_matching_host(struct device_node *node,
mutex_lock(&irq_domain_mutex);
list_for_each_entry(h, &irq_domain_list, link) {
if (h->ops->match)
- rc = h->ops->match(h, node, bus_token);
+ rc = h->ops->match(h, node, bus_token, NULL);
else
rc = ((h->of_node != NULL) && (h->of_node == node) &&
((bus_token == DOMAIN_BUS_ANY) ||