Messages in this thread Patch in this message | | | Date | Wed, 17 May 2006 02:18:27 +0200 | From | Ingo Molnar <> | Subject | [patch 42/50] genirq: ARM: Convert sa1100 to generic irq handling |
| |
From: Thomas Gleixner <tglx@linutronix.de>
Fixup the conversion to generic irq subsystem.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/arm/mach-sa1100/cerf.c | 1 + arch/arm/mach-sa1100/h3600.c | 2 +- arch/arm/mach-sa1100/irq.c | 3 ++- arch/arm/mach-sa1100/neponset.c | 6 +++--- arch/arm/mach-sa1100/pleb.c | 1 + arch/arm/mach-sa1100/time.c | 1 + 6 files changed, 9 insertions(+), 5 deletions(-)
Index: linux-genirq.q/arch/arm/mach-sa1100/cerf.c =================================================================== --- linux-genirq.q.orig/arch/arm/mach-sa1100/cerf.c +++ linux-genirq.q/arch/arm/mach-sa1100/cerf.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/tty.h> #include <linux/platform_device.h> +#include <linux/irq.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> Index: linux-genirq.q/arch/arm/mach-sa1100/h3600.c =================================================================== --- linux-genirq.q.orig/arch/arm/mach-sa1100/h3600.c +++ linux-genirq.q/arch/arm/mach-sa1100/h3600.c @@ -836,7 +836,7 @@ static void __init h3800_init_irq(void) } #endif set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING); - set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, &h3800_IRQ_demux); + set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux); } Index: linux-genirq.q/arch/arm/mach-sa1100/irq.c =================================================================== --- linux-genirq.q.orig/arch/arm/mach-sa1100/irq.c +++ linux-genirq.q/arch/arm/mach-sa1100/irq.c @@ -11,12 +11,13 @@ */ #include <linux/init.h> #include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/ioport.h> #include <linux/ptrace.h> #include <linux/sysdev.h> #include <asm/hardware.h> -#include <asm/irq.h> #include <asm/mach/irq.h> #include "generic.h" Index: linux-genirq.q/arch/arm/mach-sa1100/neponset.c =================================================================== --- linux-genirq.q.orig/arch/arm/mach-sa1100/neponset.c +++ linux-genirq.q/arch/arm/mach-sa1100/neponset.c @@ -39,7 +39,7 @@ neponset_irq_handler(unsigned int irq, s /* * Acknowledge the parent IRQ. */ - desc->chip->ack(irq); + desc->handler->ack(irq); /* * Read the interrupt reason register. Let's have all @@ -57,7 +57,7 @@ neponset_irq_handler(unsigned int irq, s * recheck the register for any pending IRQs. */ if (irr & (IRR_ETHERNET | IRR_USAR)) { - desc->chip->mask(irq); + desc->handler->mask(irq); if (irr & IRR_ETHERNET) { d = irq_desc + IRQ_NEPONSET_SMC9196; @@ -69,7 +69,7 @@ neponset_irq_handler(unsigned int irq, s desc_handle_irq(IRQ_NEPONSET_USAR, d, regs); } - desc->chip->unmask(irq); + desc->handler->unmask(irq); } if (irr & IRR_SA1111) { Index: linux-genirq.q/arch/arm/mach-sa1100/pleb.c =================================================================== --- linux-genirq.q.orig/arch/arm/mach-sa1100/pleb.c +++ linux-genirq.q/arch/arm/mach-sa1100/pleb.c @@ -7,6 +7,7 @@ #include <linux/tty.h> #include <linux/ioport.h> #include <linux/platform_device.h> +#include <linux/irq.h> #include <linux/mtd/partitions.h> Index: linux-genirq.q/arch/arm/mach-sa1100/time.c =================================================================== --- linux-genirq.q.orig/arch/arm/mach-sa1100/time.c +++ linux-genirq.q/arch/arm/mach-sa1100/time.c @@ -11,6 +11,7 @@ #include <linux/init.h> #include <linux/errno.h> #include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/timex.h> #include <linux/signal.h> - 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/
| |