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-ixp2000/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-ixp2000/core.c')
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 22c98e9dad28..27b7480f4afe 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -308,7 +308,7 @@ EXPORT_SYMBOL(gpio_line_config); | |||
308 | /************************************************************************* | 308 | /************************************************************************* |
309 | * IRQ handling IXP2000 | 309 | * IRQ handling IXP2000 |
310 | *************************************************************************/ | 310 | *************************************************************************/ |
311 | static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irqdesc *desc) | 311 | static void ixp2000_GPIO_irq_handler(unsigned int irq, struct irq_desc *desc) |
312 | { | 312 | { |
313 | int i; | 313 | int i; |
314 | unsigned long status = *IXP2000_GPIO_INST; | 314 | unsigned long status = *IXP2000_GPIO_INST; |
@@ -373,7 +373,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq) | |||
373 | ixp2000_reg_write(IXP2000_GPIO_INSR, (1 << (irq - IRQ_IXP2000_GPIO0))); | 373 | ixp2000_reg_write(IXP2000_GPIO_INSR, (1 << (irq - IRQ_IXP2000_GPIO0))); |
374 | } | 374 | } |
375 | 375 | ||
376 | static struct irqchip ixp2000_GPIO_irq_chip = { | 376 | static struct irq_chip ixp2000_GPIO_irq_chip = { |
377 | .ack = ixp2000_GPIO_irq_mask_ack, | 377 | .ack = ixp2000_GPIO_irq_mask_ack, |
378 | .mask = ixp2000_GPIO_irq_mask, | 378 | .mask = ixp2000_GPIO_irq_mask, |
379 | .unmask = ixp2000_GPIO_irq_unmask, | 379 | .unmask = ixp2000_GPIO_irq_unmask, |
@@ -401,7 +401,7 @@ static void ixp2000_pci_irq_unmask(unsigned int irq) | |||
401 | /* | 401 | /* |
402 | * Error interrupts. These are used extensively by the microengine drivers | 402 | * Error interrupts. These are used extensively by the microengine drivers |
403 | */ | 403 | */ |
404 | static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc) | 404 | static void ixp2000_err_irq_handler(unsigned int irq, struct irq_desc *desc) |
405 | { | 405 | { |
406 | int i; | 406 | int i; |
407 | unsigned long status = *IXP2000_IRQ_ERR_STATUS; | 407 | unsigned long status = *IXP2000_IRQ_ERR_STATUS; |
@@ -426,13 +426,13 @@ static void ixp2000_err_irq_unmask(unsigned int irq) | |||
426 | (1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR))); | 426 | (1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR))); |
427 | } | 427 | } |
428 | 428 | ||
429 | static struct irqchip ixp2000_err_irq_chip = { | 429 | static struct irq_chip ixp2000_err_irq_chip = { |
430 | .ack = ixp2000_err_irq_mask, | 430 | .ack = ixp2000_err_irq_mask, |
431 | .mask = ixp2000_err_irq_mask, | 431 | .mask = ixp2000_err_irq_mask, |
432 | .unmask = ixp2000_err_irq_unmask | 432 | .unmask = ixp2000_err_irq_unmask |
433 | }; | 433 | }; |
434 | 434 | ||
435 | static struct irqchip ixp2000_pci_irq_chip = { | 435 | static struct irq_chip ixp2000_pci_irq_chip = { |
436 | .ack = ixp2000_pci_irq_mask, | 436 | .ack = ixp2000_pci_irq_mask, |
437 | .mask = ixp2000_pci_irq_mask, | 437 | .mask = ixp2000_pci_irq_mask, |
438 | .unmask = ixp2000_pci_irq_unmask | 438 | .unmask = ixp2000_pci_irq_unmask |
@@ -448,7 +448,7 @@ static void ixp2000_irq_unmask(unsigned int irq) | |||
448 | ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << irq)); | 448 | ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << irq)); |
449 | } | 449 | } |
450 | 450 | ||
451 | static struct irqchip ixp2000_irq_chip = { | 451 | static struct irq_chip ixp2000_irq_chip = { |
452 | .ack = ixp2000_irq_mask, | 452 | .ack = ixp2000_irq_mask, |
453 | .mask = ixp2000_irq_mask, | 453 | .mask = ixp2000_irq_mask, |
454 | .unmask = ixp2000_irq_unmask | 454 | .unmask = ixp2000_irq_unmask |
@@ -484,7 +484,7 @@ void __init ixp2000_init_irq(void) | |||
484 | for (irq = IRQ_IXP2000_SOFT_INT; irq <= IRQ_IXP2000_THDB3; irq++) { | 484 | for (irq = IRQ_IXP2000_SOFT_INT; irq <= IRQ_IXP2000_THDB3; irq++) { |
485 | if ((1 << irq) & IXP2000_VALID_IRQ_MASK) { | 485 | if ((1 << irq) & IXP2000_VALID_IRQ_MASK) { |
486 | set_irq_chip(irq, &ixp2000_irq_chip); | 486 | set_irq_chip(irq, &ixp2000_irq_chip); |
487 | set_irq_handler(irq, do_level_IRQ); | 487 | set_irq_handler(irq, handle_level_irq); |
488 | set_irq_flags(irq, IRQF_VALID); | 488 | set_irq_flags(irq, IRQF_VALID); |
489 | } else set_irq_flags(irq, 0); | 489 | } else set_irq_flags(irq, 0); |
490 | } | 490 | } |
@@ -493,7 +493,7 @@ void __init ixp2000_init_irq(void) | |||
493 | if((1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)) & | 493 | if((1 << (irq - IRQ_IXP2000_DRAM0_MIN_ERR)) & |
494 | IXP2000_VALID_ERR_IRQ_MASK) { | 494 | IXP2000_VALID_ERR_IRQ_MASK) { |
495 | set_irq_chip(irq, &ixp2000_err_irq_chip); | 495 | set_irq_chip(irq, &ixp2000_err_irq_chip); |
496 | set_irq_handler(irq, do_level_IRQ); | 496 | set_irq_handler(irq, handle_level_irq); |
497 | set_irq_flags(irq, IRQF_VALID); | 497 | set_irq_flags(irq, IRQF_VALID); |
498 | } | 498 | } |
499 | else | 499 | else |
@@ -503,7 +503,7 @@ void __init ixp2000_init_irq(void) | |||
503 | 503 | ||
504 | for (irq = IRQ_IXP2000_GPIO0; irq <= IRQ_IXP2000_GPIO7; irq++) { | 504 | for (irq = IRQ_IXP2000_GPIO0; irq <= IRQ_IXP2000_GPIO7; irq++) { |
505 | set_irq_chip(irq, &ixp2000_GPIO_irq_chip); | 505 | set_irq_chip(irq, &ixp2000_GPIO_irq_chip); |
506 | set_irq_handler(irq, do_level_IRQ); | 506 | set_irq_handler(irq, handle_level_irq); |
507 | set_irq_flags(irq, IRQF_VALID); | 507 | set_irq_flags(irq, IRQF_VALID); |
508 | } | 508 | } |
509 | set_irq_chained_handler(IRQ_IXP2000_GPIO, ixp2000_GPIO_irq_handler); | 509 | set_irq_chained_handler(IRQ_IXP2000_GPIO, ixp2000_GPIO_irq_handler); |
@@ -516,7 +516,7 @@ void __init ixp2000_init_irq(void) | |||
516 | ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << IRQ_IXP2000_PCI)); | 516 | ixp2000_reg_write(IXP2000_IRQ_ENABLE_SET, (1 << IRQ_IXP2000_PCI)); |
517 | for (irq = IRQ_IXP2000_PCIA; irq <= IRQ_IXP2000_PCIB; irq++) { | 517 | for (irq = IRQ_IXP2000_PCIA; irq <= IRQ_IXP2000_PCIB; irq++) { |
518 | set_irq_chip(irq, &ixp2000_pci_irq_chip); | 518 | set_irq_chip(irq, &ixp2000_pci_irq_chip); |
519 | set_irq_handler(irq, do_level_IRQ); | 519 | set_irq_handler(irq, handle_level_irq); |
520 | set_irq_flags(irq, IRQF_VALID); | 520 | set_irq_flags(irq, IRQF_VALID); |
521 | } | 521 | } |
522 | } | 522 | } |