Commit-ID: c5863484c16b37a266ef9c0d728352b4e115a46a Gitweb: http://git.kernel.org/tip/c5863484c16b37a266ef9c0d728352b4e115a46a Author: Stefan Agner <ste...@agner.ch> AuthorDate: Sat, 16 May 2015 11:44:15 +0200 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Mon, 18 May 2015 17:32:44 +0200
genirq: generic chip: Support hierarchy domain Use the new helper function irq_domain_set_info to make sure the function irq_domain_set_hwirq_and_chip is being called, which is crucial to save irqdomain specific data to irq_data. Signed-off-by: Stefan Agner <ste...@agner.ch> Cc: marc.zyng...@arm.com Cc: li...@arm.linux.org.uk Cc: u.kleine-koe...@pengutronix.de Cc: o...@lixom.net Cc: a...@arndb.de Cc: daniel.lezc...@linaro.org Cc: mark.rutl...@arm.com Cc: pawel.m...@arm.com Cc: robh...@kernel.org Cc: ijc+devicet...@hellion.org.uk Cc: ga...@codeaurora.org Cc: mcoquelin.st...@gmail.com Cc: linux-arm-ker...@lists.infradead.org Cc: shawn....@linaro.org Cc: ker...@pengutronix.de Cc: ja...@lakedaemon.net Link: http://lkml.kernel.org/r/1431769465-26867-4-git-send-email-ste...@agner.ch Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- kernel/irq/generic-chip.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index 61024e8..15b370d 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -360,7 +360,7 @@ static struct lock_class_key irq_nested_lock_class; int irq_map_generic_chip(struct irq_domain *d, unsigned int virq, irq_hw_number_t hw_irq) { - struct irq_data *data = irq_get_irq_data(virq); + struct irq_data *data = irq_domain_get_irq_data(d, virq); struct irq_domain_chip_generic *dgc = d->gc; struct irq_chip_generic *gc; struct irq_chip_type *ct; @@ -405,8 +405,7 @@ int irq_map_generic_chip(struct irq_domain *d, unsigned int virq, else data->mask = 1 << idx; - irq_set_chip_and_handler(virq, chip, ct->handler); - irq_set_chip_data(virq, gc); + irq_domain_set_info(d, virq, hw_irq, chip, gc, ct->handler, NULL, NULL); irq_modify_status(virq, dgc->irq_flags_to_clear, dgc->irq_flags_to_set); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
