genirq/generic_chip: Get rid of code duplication
irq_map_generic_chip() contains about the same code as irq_get_domain_generic_chip() except for the return values. Split out the irq_get_domain_generic_chip() implementation so it can be reused. [ tglx: Removed the extra churn in irq_get_domain_generic_chip() callers and massaged changelog ] Signed-off-by: Sebastian Frias <sf84@laposte.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Mason <slash.tmp@free.fr> Cc: Jason Cooper <jason@lakedaemon.net> Link: http://lkml.kernel.org/r/579F5C69.8070006@laposte.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
48e0fba842
commit
f0c450eaa3
|
@ -328,6 +328,20 @@ int irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(irq_alloc_domain_generic_chips);
|
EXPORT_SYMBOL_GPL(irq_alloc_domain_generic_chips);
|
||||||
|
|
||||||
|
static struct irq_chip_generic *
|
||||||
|
__irq_get_domain_generic_chip(struct irq_domain *d, unsigned int hw_irq)
|
||||||
|
{
|
||||||
|
struct irq_domain_chip_generic *dgc = d->gc;
|
||||||
|
int idx;
|
||||||
|
|
||||||
|
if (!dgc)
|
||||||
|
return ERR_PTR(-ENODEV);
|
||||||
|
idx = hw_irq / dgc->irqs_per_chip;
|
||||||
|
if (idx >= dgc->num_chips)
|
||||||
|
return ERR_PTR(-EINVAL);
|
||||||
|
return dgc->gc[idx];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* irq_get_domain_generic_chip - Get a pointer to the generic chip of a hw_irq
|
* irq_get_domain_generic_chip - Get a pointer to the generic chip of a hw_irq
|
||||||
* @d: irq domain pointer
|
* @d: irq domain pointer
|
||||||
|
@ -336,15 +350,9 @@ EXPORT_SYMBOL_GPL(irq_alloc_domain_generic_chips);
|
||||||
struct irq_chip_generic *
|
struct irq_chip_generic *
|
||||||
irq_get_domain_generic_chip(struct irq_domain *d, unsigned int hw_irq)
|
irq_get_domain_generic_chip(struct irq_domain *d, unsigned int hw_irq)
|
||||||
{
|
{
|
||||||
struct irq_domain_chip_generic *dgc = d->gc;
|
struct irq_chip_generic *gc = __irq_get_domain_generic_chip(d, hw_irq);
|
||||||
int idx;
|
|
||||||
|
|
||||||
if (!dgc)
|
return !IS_ERR(gc) ? gc : NULL;
|
||||||
return NULL;
|
|
||||||
idx = hw_irq / dgc->irqs_per_chip;
|
|
||||||
if (idx >= dgc->num_chips)
|
|
||||||
return NULL;
|
|
||||||
return dgc->gc[idx];
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(irq_get_domain_generic_chip);
|
EXPORT_SYMBOL_GPL(irq_get_domain_generic_chip);
|
||||||
|
|
||||||
|
@ -368,13 +376,9 @@ int irq_map_generic_chip(struct irq_domain *d, unsigned int virq,
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int idx;
|
int idx;
|
||||||
|
|
||||||
if (!d->gc)
|
gc = __irq_get_domain_generic_chip(d, hw_irq);
|
||||||
return -ENODEV;
|
if (IS_ERR(gc))
|
||||||
|
return PTR_ERR(gc);
|
||||||
idx = hw_irq / dgc->irqs_per_chip;
|
|
||||||
if (idx >= dgc->num_chips)
|
|
||||||
return -EINVAL;
|
|
||||||
gc = dgc->gc[idx];
|
|
||||||
|
|
||||||
idx = hw_irq % dgc->irqs_per_chip;
|
idx = hw_irq % dgc->irqs_per_chip;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue