aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-06-04 01:04:35 -0400
committerGrant Likely <grant.likely@secretlab.ca>2012-06-15 14:08:09 -0400
commit732557047128e5c200c3590efba39f10ac46bcb2 (patch)
tree325db6acedf3501128ca9c88f6f2c28d5573ffdb /kernel
parent5ca4db61e859526b2dbee3bcea3626d3de49a0b2 (diff)
irqdomain: Remove unnecessary test for IRQ_DOMAIN_MAP_LEGACY
Where irq_domain_associate() is called in irq_create_mapping, there is no need to test for IRQ_DOMAIN_MAP_LEGACY because it is already tested for earlier in the routine. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/irqdomain.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 79ae0ebb90ba..b1f774cfd089 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -445,8 +445,7 @@ unsigned int irq_create_mapping(struct irq_domain *domain,
445 } 445 }
446 446
447 if (irq_setup_virq(domain, virq, hwirq)) { 447 if (irq_setup_virq(domain, virq, hwirq)) {
448 if (domain->revmap_type != IRQ_DOMAIN_MAP_LEGACY) 448 irq_free_desc(virq);
449 irq_free_desc(virq);
450 return 0; 449 return 0;
451 } 450 }
452 451