Commit-ID: c5863484c16b37a266ef9c0d728352b4e115a46a
Gitweb: http://git.kernel.org/tip/c5863484c16b37a266ef9c0d728352b4e115a46a
Author: Stefan Agner <stefan@xxxxxxxx>
AuthorDate: Sat, 16 May 2015 11:44:15 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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 <stefan@xxxxxxxx>
Cc: marc.zyngier@xxxxxxx
Cc: linux@xxxxxxxxxxxxxxxx
Cc: u.kleine-koenig@xxxxxxxxxxxxxx
Cc: olof@xxxxxxxxx
Cc: arnd@xxxxxxxx
Cc: daniel.lezcano@xxxxxxxxxx
Cc: mark.rutland@xxxxxxx
Cc: pawel.moll@xxxxxxx
Cc: robh+dt@xxxxxxxxxx
Cc: ijc+devicetree@xxxxxxxxxxxxxx
Cc: galak@xxxxxxxxxxxxxx
Cc: mcoquelin.stm32@xxxxxxxxx
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: shawn.guo@xxxxxxxxxx
Cc: kernel@xxxxxxxxxxxxxx
Cc: jason@xxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1431769465-26867-4-git-send-email-stefan@xxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
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-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|