diff options
Diffstat (limited to 'arch/arm/mach-ixp23xx')
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/ixdp2351.c | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 68b4ac5b2481..aa4c4420ff3d 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -253,7 +253,6 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc) | |||
253 | { | 253 | { |
254 | u32 pci_interrupt; | 254 | u32 pci_interrupt; |
255 | unsigned int irqno; | 255 | unsigned int irqno; |
256 | struct irq_desc *int_desc; | ||
257 | 256 | ||
258 | pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS; | 257 | pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS; |
259 | 258 | ||
@@ -268,8 +267,7 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc) | |||
268 | BUG(); | 267 | BUG(); |
269 | } | 268 | } |
270 | 269 | ||
271 | int_desc = irq_desc + irqno; | 270 | generic_handle_irq(irqno); |
272 | desc_handle_irq(irqno, int_desc); | ||
273 | 271 | ||
274 | desc->chip->unmask(irq); | 272 | desc->chip->unmask(irq); |
275 | } | 273 | } |
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c index b6e0bfa44df9..f1b124a709ab 100644 --- a/arch/arm/mach-ixp23xx/ixdp2351.c +++ b/arch/arm/mach-ixp23xx/ixdp2351.c | |||
@@ -68,11 +68,9 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irq_desc *desc) | |||
68 | 68 | ||
69 | for (i = 0; i < IXDP2351_INTA_IRQ_NUM; i++) { | 69 | for (i = 0; i < IXDP2351_INTA_IRQ_NUM; i++) { |
70 | if (ex_interrupt & (1 << i)) { | 70 | if (ex_interrupt & (1 << i)) { |
71 | struct irq_desc *cpld_desc; | ||
72 | int cpld_irq = | 71 | int cpld_irq = |
73 | IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i); | 72 | IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i); |
74 | cpld_desc = irq_desc + cpld_irq; | 73 | generic_handle_irq(cpld_irq); |
75 | desc_handle_irq(cpld_irq, cpld_desc); | ||
76 | } | 74 | } |
77 | } | 75 | } |
78 | 76 | ||
@@ -105,11 +103,9 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irq_desc *desc) | |||
105 | 103 | ||
106 | for (i = 0; i < IXDP2351_INTB_IRQ_NUM; i++) { | 104 | for (i = 0; i < IXDP2351_INTB_IRQ_NUM; i++) { |
107 | if (ex_interrupt & (1 << i)) { | 105 | if (ex_interrupt & (1 << i)) { |
108 | struct irq_desc *cpld_desc; | ||
109 | int cpld_irq = | 106 | int cpld_irq = |
110 | IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i); | 107 | IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i); |
111 | cpld_desc = irq_desc + cpld_irq; | 108 | generic_handle_irq(cpld_irq); |
112 | desc_handle_irq(cpld_irq, cpld_desc); | ||
113 | } | 109 | } |
114 | } | 110 | } |
115 | 111 | ||