lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irq_domain: Make irq_domain structure match powerpc's irq_host

Browse Source 
Part of the series to unify the irq remapping mechanisms in the
kernel.  A follow up patch will copy the powerpc implementation into
kernel/irq/irqdomain.c, which will be a lot easier if the structures
are identical.

Where they differ, I've chose to use the powerpc names since there is
a lot more code using those names.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Tested-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Grant Likely
2012-02-14 14:06:48 -07:00
parent e1964c50a8
commit 7bb69bade0
3 changed files with 78 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/irq/irqdomain.c
View File

@@ -43,7 +43,7 @@ void irq_domain_add(struct irq_domain *domain)
}
mutex_lock(&irq_domain_mutex);
list_add(&domain->list, &irq_domain_list);
list_add(&domain->link, &irq_domain_list);
mutex_unlock(&irq_domain_mutex);
}
@@ -57,7 +57,7 @@ void irq_domain_del(struct irq_domain *domain)
int hwirq, irq;
mutex_lock(&irq_domain_mutex);
list_del(&domain->list);
list_del(&domain->link);
mutex_unlock(&irq_domain_mutex);
/* Clear the irq_domain assignments */
@@ -88,10 +88,10 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
/* Find a domain which can translate the irq spec */
mutex_lock(&irq_domain_mutex);
list_for_each_entry(domain, &irq_domain_list, list) {
if (!domain->ops->dt_translate)
list_for_each_entry(domain, &irq_domain_list, link) {
if (!domain->ops->xlate)
continue;
rc = domain->ops->dt_translate(domain, controller,
rc = domain->ops->xlate(domain, controller,
intspec, intsize, &hwirq, &type);
if (rc == 0)
break;
@@ -126,7 +126,7 @@ void irq_dispose_mapping(unsigned int irq)
}
EXPORT_SYMBOL_GPL(irq_dispose_mapping);
int irq_domain_simple_dt_translate(struct irq_domain *d,
int irq_domain_simple_xlate(struct irq_domain *d,
struct device_node *controller,
const u32 *intspec, unsigned int intsize,
unsigned long *out_hwirq, unsigned int *out_type)
@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(irq_domain_generate_simple);
struct irq_domain_ops irq_domain_simple_ops = {
#ifdef CONFIG_OF_IRQ
.dt_translate = irq_domain_simple_dt_translate,
.xlate = irq_domain_simple_xlate,
#endif /* CONFIG_OF_IRQ */
};
EXPORT_SYMBOL_GPL(irq_domain_simple_ops);