Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Thomas Gleixner:
"Three fixlets from the ARM SoC camp:
- correct irqdomain initialization for atmel-aic
- correct error handling for device tree parsing in bcm controllers"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: brcmstb-l2: Fix error handling of irq_of_parse_and_map
irqchip: bcm7120-l2: Fix error handling of irq_of_parse_and_map
irqchip: atmel-aic: Fix irqdomain initialization

+3 -3
drivers/irqchip/irq-atmel-aic-common.c
··· 217 217 } 218 218 219 219 ret = irq_alloc_domain_generic_chips(domain, 32, 1, name, 220 - handle_level_irq, 0, 0, 221 - IRQCHIP_SKIP_SET_WAKE); 220 + handle_fasteoi_irq, 221 + IRQ_NOREQUEST | IRQ_NOPROBE | 222 + IRQ_NOAUTOEN, 0, 0); 222 223 if (ret) 223 224 goto err_domain_remove; 224 225 ··· 231 230 gc->unused = 0; 232 231 gc->wake_enabled = ~0; 233 232 gc->chip_types[0].type = IRQ_TYPE_SENSE_MASK; 234 - gc->chip_types[0].handler = handle_fasteoi_irq; 235 233 gc->chip_types[0].chip.irq_eoi = irq_gc_eoi; 236 234 gc->chip_types[0].chip.irq_set_wake = irq_gc_set_wake; 237 235 gc->chip_types[0].chip.irq_shutdown = aic_common_shutdown;
+2 -2
drivers/irqchip/irq-bcm7120-l2.c
··· 101 101 int parent_irq; 102 102 103 103 parent_irq = irq_of_parse_and_map(dn, irq); 104 - if (parent_irq < 0) { 104 + if (!parent_irq) { 105 105 pr_err("failed to map interrupt %d\n", irq); 106 - return parent_irq; 106 + return -EINVAL; 107 107 } 108 108 109 109 data->irq_map_mask |= be32_to_cpup(map_mask + irq);
+2 -2
drivers/irqchip/irq-brcmstb-l2.c
··· 135 135 __raw_writel(0xffffffff, data->base + CPU_CLEAR); 136 136 137 137 data->parent_irq = irq_of_parse_and_map(np, 0); 138 - if (data->parent_irq < 0) { 138 + if (!data->parent_irq) { 139 139 pr_err("failed to find parent interrupt\n"); 140 - ret = data->parent_irq; 140 + ret = -EINVAL; 141 141 goto out_unmap; 142 142 } 143 143