From: Grazvydas Ignotas Date: Sat, 5 May 2012 23:56:52 +0000 (+0300) Subject: ARM: OMAP2+: remove incorrect irq_chip ack field X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~13274^2~1^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d723c17ab6e7f04f49cd715d5de4d4f6edf7b28a;p=mirror_ubuntu-zesty-kernel.git ARM: OMAP2+: remove incorrect irq_chip ack field Each irq_chip for the main interrupt controller has offsets set for irq masking registers, which added to respective base results in a pointer to appropriate hardware register. However this is not correct for INTC_CONTROL as there is only one INTC_CONTROL register. This does not cause problems because generic ack code is never called, but remove this assignment to avoid confusion. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 65f0d2571c9a..c11e8a84c947 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -149,7 +149,6 @@ omap_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) ct->chip.irq_mask = irq_gc_mask_disable_reg; ct->chip.irq_unmask = irq_gc_unmask_enable_reg; - ct->regs.ack = INTC_CONTROL; ct->regs.enable = INTC_MIR_CLEAR0; ct->regs.disable = INTC_MIR_SET0; irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,