Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae71c426 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Russell King
Browse files

[ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling 



Patch from Thomas Gleixner

From: Thomas Gleixner <tglx@linutronix.de>

Fixup the conversion to generic irq subsystem.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 418ca1f0

arch/arm/mach-ixp23xx/core.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs * 
	}



	int_desc = irq_desc + irqno;

	int_desc->handle(irqno, int_desc, regs);

	desc_handle_irq(irqno, int_desc, regs);



	desc->chip->unmask(irq);

}

arch/arm/mach-ixp23xx/ixdp2351.c

+5 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/spinlock.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/serial.h>

#include <linux/tty.h>

#include <linux/bitops.h>
@@ -36,7 +37,6 @@ 
#include <asm/memory.h>

#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>

#include <asm/system.h>

#include <asm/tlbflush.h>

#include <asm/pgtable.h>
@@ -74,7 +74,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct 
			int cpld_irq =

				IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);

			cpld_desc = irq_desc + cpld_irq;

			cpld_desc->handle(cpld_irq, cpld_desc, regs);

			desc_handle_irq(cpld_irq, cpld_desc, regs);

		}

	}
@@ -111,7 +111,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct 
			int cpld_irq =

				IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);

			cpld_desc = irq_desc + cpld_irq;

			cpld_desc->handle(cpld_irq, cpld_desc, regs);

			desc_handle_irq(cpld_irq, cpld_desc, regs);

		}

	}
@@ -158,8 +158,8 @@ void ixdp2351_init_irq(void) 
		}

	}



	set_irq_chained_handler(IRQ_IXP23XX_INTA, &ixdp2351_inta_handler);

	set_irq_chained_handler(IRQ_IXP23XX_INTB, &ixdp2351_intb_handler);

	set_irq_chained_handler(IRQ_IXP23XX_INTA, ixdp2351_inta_handler);

	set_irq_chained_handler(IRQ_IXP23XX_INTB, ixdp2351_intb_handler);

}



/*