Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> Cc: Grant Likely <grant.likely@xxxxxxxxxx> Cc: Rob Herring <rob.herring@xxxxxxxxxxx> Cc: Rob Landley <rob@xxxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Jason Cooper <jason@xxxxxxxxxxxxxx> Cc: Andrew Lunn <andrew@xxxxxxx> Cc: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx> Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx> Cc: Gregory Clement <gregory.clement@xxxxxxxxxxxxxxxxxx> Cc: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx> Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> Cc: Jean-Francois Moine <moinejf@xxxxxxx> Cc: Gerlando Falauto <gerlando.falauto@xxxxxxxxxxx> Cc: Uwe Kleine-Koenig <u.kleine-koenig@xxxxxxxxxxxxxx> Cc: devicetree-discuss@xxxxxxxxxxxxxxxx Cc: linux-doc@xxxxxxxxxxxxxxx Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx --- drivers/irqchip/irq-sun4i.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c index 0191f2c..cab36b1 100644 --- a/drivers/irqchip/irq-sun4i.c +++ b/drivers/irqchip/irq-sun4i.c @@ -46,7 +46,8 @@ static int __init sun4i_init_domain_chips(void) struct irq_chip_generic *gc; int i, ret, base = 0; - ret = irq_alloc_domain_generic_chips(d, SUN4I_IRQS_PER_CHIP, 1, + ret = irq_alloc_domain_generic_chips(sun4i_irq_domain, + SUN4I_IRQS_PER_CHIP, 1, "sun4i_irq", handle_level_irq, clr, 0, IRQ_GC_INIT_MASK_CACHE); if (ret) @@ -57,9 +58,9 @@ static int __init sun4i_init_domain_chips(void) gc->reg_base = sun4i_irq_base; gc->chip_types[0].regs.mask = SUN4I_IRQ_ENABLE_REG(i); gc->chip_types[0].regs.ack = SUN4I_IRQ_PENDING_REG(i); - gc->chip_types[0].chip.mask = irq_gc_mask_clr_bit; - gc->chip_types[0].chip.ack = irq_gc_ack_set_bit; - gc->chip_types[0].chip.unmask = irq_gc_mask_set_bit; + gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit; + gc->chip_types[0].chip.irq_ack = irq_gc_ack_set_bit; + gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit; /* Disable, mask and clear all pending interrupts */ writel(0, sun4i_irq_base + SUN4I_IRQ_ENABLE_REG(i)); -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html