[irqchip: irq/irqchip-next] fixup! irqdomain: Introduce irq_resolve_mapping()

[irqchip: irq/irqchip-next] fixup! irqdomain: Introduce irq_resolve_mapping()

[irqchip-bot for Marc Zyngier]

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     9b8a506983a1e5d8c5c0841c66d42b6e309ba60d
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/9b8a506983a1e5d8c5c0841c66d42b6e309ba60d
Author:        Marc Zyngier <maz@kernel.org>
AuthorDate:    Sun, 06 Jun 2021 20:19:14 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Sun, 06 Jun 2021 20:19:14 +01:00

fixup! irqdomain: Introduce irq_resolve_mapping()
---
 include/linux/irqdomain.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 5b7de06..23e4ee5 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -31,8 +31,7 @@
 #define _LINUX_IRQDOMAIN_H
 
 #include <linux/types.h>
-#include <linux/irq.h>
-#include <linux/irqdesc.h>
+#include <linux/irqhandler.h>
 #include <linux/of.h>
 #include <linux/mutex.h>
 #include <linux/radix-tree.h>
@@ -42,6 +41,7 @@ struct fwnode_handle;
 struct irq_domain;
 struct irq_chip;
 struct irq_data;
+struct irq_desc;
 struct cpumask;
 struct seq_file;
 struct irq_affinity_desc;

[irqchip: irq/irqchip-next] fixup! irqdomain: Introduce irq_resolve_mapping()

[irqchip-bot for Marc Zyngier]

The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     09816d49a254b5616e313dfef720322393129c29
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/09816d49a254b5616e313dfef720322393129c29
Author:        Marc Zyngier <maz@kernel.org>
AuthorDate:    Sun, 06 Jun 2021 15:38:17 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Sun, 06 Jun 2021 15:38:17 +01:00

fixup! irqdomain: Introduce irq_resolve_mapping()
---
 kernel/irq/irqdomain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 012d6bf..f27db50 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -876,7 +876,7 @@ void irq_dispose_mapping(unsigned int virq)
 EXPORT_SYMBOL_GPL(irq_dispose_mapping);
 
 /**
- * irq_resolve_mapping() - Find a linux irq from a hw irq number.
+ * __irq_resolve_mapping() - Find a linux irq from a hw irq number.
  * @domain: domain owning this hardware interrupt
  * @hwirq: hardware irq number in that domain space
  * @irq: optional pointer to return the Linux irq if required