Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753214Ab3ELOFe (ORCPT ); Sun, 12 May 2013 10:05:34 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:39261 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752752Ab3ELOFc (ORCPT ); Sun, 12 May 2013 10:05:32 -0400 From: Maxime Ripard To: Thomas Gleixner Cc: Maxime Ripard , Russell King - ARM Linux , Grant Likely , Rob Herring , Rob Landley , Arnd Bergmann , Jason Cooper , Andrew Lunn , Jason Gunthorpe , Thomas Petazzoni , Gregory Clement , Ezequiel Garcia , Jean-Francois Moine , Gerlando Falauto , Uwe Kleine-Koenig , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jiri Kosina Subject: [PATCH] irq-sun4i: Fix trivial build errors Date: Sun, 12 May 2013 16:05:14 +0200 Message-Id: <1368367514-21782-1-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <20130506142539.523110430@linutronix.de> References: <20130506142539.523110430@linutronix.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2526 Lines: 60 Signed-off-by: Maxime Ripard Cc: Thomas Gleixner Cc: Russell King - ARM Linux Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Arnd Bergmann Cc: Jason Cooper Cc: Andrew Lunn Cc: Jason Gunthorpe Cc: Thomas Petazzoni Cc: Gregory Clement Cc: Ezequiel Garcia Cc: Maxime Ripard Cc: Jean-Francois Moine Cc: Gerlando Falauto Cc: Uwe Kleine-Koenig Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/