[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-c5863484c16b37a266ef9c0d728352b4e115a46a@git.kernel.org>
Date: Mon, 18 May 2015 08:37:09 -0700
From: tip-bot for Stefan Agner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, linux-kernel@...r.kernel.org, tglx@...utronix.de,
mingo@...nel.org, stefan@...er.ch
Subject: [tip:irq/core] genirq: generic chip: Support hierarchy domain
Commit-ID: c5863484c16b37a266ef9c0d728352b4e115a46a
Gitweb: http://git.kernel.org/tip/c5863484c16b37a266ef9c0d728352b4e115a46a
Author: Stefan Agner <stefan@...er.ch>
AuthorDate: Sat, 16 May 2015 11:44:15 +0200
Committer: Thomas Gleixner <tglx@...utronix.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 <stefan@...er.ch>
Cc: marc.zyngier@....com
Cc: linux@....linux.org.uk
Cc: u.kleine-koenig@...gutronix.de
Cc: olof@...om.net
Cc: arnd@...db.de
Cc: daniel.lezcano@...aro.org
Cc: mark.rutland@....com
Cc: pawel.moll@....com
Cc: robh+dt@...nel.org
Cc: ijc+devicetree@...lion.org.uk
Cc: galak@...eaurora.org
Cc: mcoquelin.stm32@...il.com
Cc: linux-arm-kernel@...ts.infradead.org
Cc: shawn.guo@...aro.org
Cc: kernel@...gutronix.de
Cc: jason@...edaemon.net
Link: http://lkml.kernel.org/r/1431769465-26867-4-git-send-email-stefan@agner.ch
Signed-off-by: Thomas Gleixner <tglx@...utronix.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 majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists