diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-11-23 06:41:32 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-30 07:24:47 -0500 |
commit | 10dd5ce28d78e2440e8fa1135d17e33399d75340 (patch) | |
tree | d2e76765a57e7e47a9c424f99c3a22bf99c6da64 /arch/arm/mach-ixp23xx/core.c | |
parent | 127e477e0cd8da4d3058709ab2dc7b92dccbcba5 (diff) |
[ARM] Remove compatibility layer for ARM irqs
set_irq_chipdata -> set_irq_chip_data
get_irq_chipdata -> get_irq_chip_data
do_level_IRQ -> handle_level_irq
do_edge_IRQ -> handle_edge_irq
do_simple_IRQ -> handle_simple_irq
irqdesc -> irq_desc
irqchip -> irq_chip
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp23xx/core.c')
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index a704a1820048..ce6ad635a00c 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -224,14 +224,14 @@ static void ixp23xx_irq_edge_unmask(unsigned int irq) | |||
224 | *intr_reg |= (1 << (irq % 32)); | 224 | *intr_reg |= (1 << (irq % 32)); |
225 | } | 225 | } |
226 | 226 | ||
227 | static struct irqchip ixp23xx_irq_level_chip = { | 227 | static struct irq_chip ixp23xx_irq_level_chip = { |
228 | .ack = ixp23xx_irq_mask, | 228 | .ack = ixp23xx_irq_mask, |
229 | .mask = ixp23xx_irq_mask, | 229 | .mask = ixp23xx_irq_mask, |
230 | .unmask = ixp23xx_irq_level_unmask, | 230 | .unmask = ixp23xx_irq_level_unmask, |
231 | .set_type = ixp23xx_irq_set_type | 231 | .set_type = ixp23xx_irq_set_type |
232 | }; | 232 | }; |
233 | 233 | ||
234 | static struct irqchip ixp23xx_irq_edge_chip = { | 234 | static struct irq_chip ixp23xx_irq_edge_chip = { |
235 | .ack = ixp23xx_irq_ack, | 235 | .ack = ixp23xx_irq_ack, |
236 | .mask = ixp23xx_irq_mask, | 236 | .mask = ixp23xx_irq_mask, |
237 | .unmask = ixp23xx_irq_edge_unmask, | 237 | .unmask = ixp23xx_irq_edge_unmask, |
@@ -251,11 +251,11 @@ static void ixp23xx_pci_irq_unmask(unsigned int irq) | |||
251 | /* | 251 | /* |
252 | * TODO: Should this just be done at ASM level? | 252 | * TODO: Should this just be done at ASM level? |
253 | */ | 253 | */ |
254 | static void pci_handler(unsigned int irq, struct irqdesc *desc) | 254 | static void pci_handler(unsigned int irq, struct irq_desc *desc) |
255 | { | 255 | { |
256 | u32 pci_interrupt; | 256 | u32 pci_interrupt; |
257 | unsigned int irqno; | 257 | unsigned int irqno; |
258 | struct irqdesc *int_desc; | 258 | struct irq_desc *int_desc; |
259 | 259 | ||
260 | pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS; | 260 | pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS; |
261 | 261 | ||
@@ -276,7 +276,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc) | |||
276 | desc->chip->unmask(irq); | 276 | desc->chip->unmask(irq); |
277 | } | 277 | } |
278 | 278 | ||
279 | static struct irqchip ixp23xx_pci_irq_chip = { | 279 | static struct irq_chip ixp23xx_pci_irq_chip = { |
280 | .ack = ixp23xx_pci_irq_mask, | 280 | .ack = ixp23xx_pci_irq_mask, |
281 | .mask = ixp23xx_pci_irq_mask, | 281 | .mask = ixp23xx_pci_irq_mask, |
282 | .unmask = ixp23xx_pci_irq_unmask | 282 | .unmask = ixp23xx_pci_irq_unmask |
@@ -287,11 +287,11 @@ static void ixp23xx_config_irq(unsigned int irq, enum ixp23xx_irq_type type) | |||
287 | switch (type) { | 287 | switch (type) { |
288 | case IXP23XX_IRQ_LEVEL: | 288 | case IXP23XX_IRQ_LEVEL: |
289 | set_irq_chip(irq, &ixp23xx_irq_level_chip); | 289 | set_irq_chip(irq, &ixp23xx_irq_level_chip); |
290 | set_irq_handler(irq, do_level_IRQ); | 290 | set_irq_handler(irq, handle_level_irq); |
291 | break; | 291 | break; |
292 | case IXP23XX_IRQ_EDGE: | 292 | case IXP23XX_IRQ_EDGE: |
293 | set_irq_chip(irq, &ixp23xx_irq_edge_chip); | 293 | set_irq_chip(irq, &ixp23xx_irq_edge_chip); |
294 | set_irq_handler(irq, do_edge_IRQ); | 294 | set_irq_handler(irq, handle_edge_irq); |
295 | break; | 295 | break; |
296 | } | 296 | } |
297 | set_irq_flags(irq, IRQF_VALID); | 297 | set_irq_flags(irq, IRQF_VALID); |
@@ -322,7 +322,7 @@ void __init ixp23xx_init_irq(void) | |||
322 | 322 | ||
323 | for (irq = IRQ_IXP23XX_INTA; irq <= IRQ_IXP23XX_INTB; irq++) { | 323 | for (irq = IRQ_IXP23XX_INTA; irq <= IRQ_IXP23XX_INTB; irq++) { |
324 | set_irq_chip(irq, &ixp23xx_pci_irq_chip); | 324 | set_irq_chip(irq, &ixp23xx_pci_irq_chip); |
325 | set_irq_handler(irq, do_level_IRQ); | 325 | set_irq_handler(irq, handle_level_irq); |
326 | set_irq_flags(irq, IRQF_VALID); | 326 | set_irq_flags(irq, IRQF_VALID); |
327 | } | 327 | } |
328 | 328 | ||