git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-lh7a40x
/
irq-lpd7a40x.c
diff --git
a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
index
458a16a
..
15b9577
100644
(file)
--- a/
arch/arm/mach-lh7a40x/irq-lpd7a40x.c
+++ b/
arch/arm/mach-lh7a40x/irq-lpd7a40x.c
@@
-19,6
+19,7
@@
#include <asm/mach/irq.h>
#include <asm/arch/irqs.h>
#include <asm/mach/irq.h>
#include <asm/arch/irqs.h>
+#include "common.h"
static void lh7a40x_ack_cpld_irq (u32 irq)
{
static void lh7a40x_ack_cpld_irq (u32 irq)
{
@@
-49,16
+50,14
@@
static void lh7a40x_unmask_cpld_irq (u32 irq)
}
}
}
}
-static struct irqchip lh7a40x_cpld_chip = {
+static struct irq_chip lh7a40x_cpld_chip = {
+ .name = "CPLD",
.ack = lh7a40x_ack_cpld_irq,
.mask = lh7a40x_mask_cpld_irq,
.unmask = lh7a40x_unmask_cpld_irq,
};
.ack = lh7a40x_ack_cpld_irq,
.mask = lh7a40x_mask_cpld_irq,
.unmask = lh7a40x_unmask_cpld_irq,
};
-#define IRQ_DISPATCH(irq) irq_desc[irq].handle ((irq), &irq_desc[irq], regs)
-
-static void lh7a40x_cpld_handler (unsigned int irq, struct irqdesc *desc,
- struct pt_regs *regs)
+static void lh7a40x_cpld_handler (unsigned int irq, struct irq_desc *desc)
{
unsigned int mask = CPLD_INTERRUPTS;
{
unsigned int mask = CPLD_INTERRUPTS;
@@
-119,7
+118,7
@@
void __init lh7a40x_init_board_irq (void)
for (irq = IRQ_BOARD_START;
irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) {
set_irq_chip (irq, &lh7a40x_cpld_chip);
for (irq = IRQ_BOARD_START;
irq < IRQ_BOARD_START + NR_IRQ_BOARD; ++irq) {
set_irq_chip (irq, &lh7a40x_cpld_chip);
- set_irq_handler (irq,
do_edge_IRQ
);
+ set_irq_handler (irq,
handle_edge_irq
);
set_irq_flags (irq, IRQF_VALID);
}
set_irq_flags (irq, IRQF_VALID);
}