diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 13:35:09 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 14:47:58 +0200 |
| commit | f38c02f3b338651e145aac2889ba976baf6b28b3 (patch) | |
| tree | 30cfbf42ccff4a9dc26d95e9058ec76f5fde78bb /arch/arm/plat-orion | |
| parent | 9323f26186403433293e87e717a7785f74f75d80 (diff) | |
| download | op-kernel-dev-f38c02f3b338651e145aac2889ba976baf6b28b3.zip op-kernel-dev-f38c02f3b338651e145aac2889ba976baf6b28b3.tar.gz | |
arm: Fold irq_set_chip/irq_set_handler
Use irq_set_chip_and_handler() instead. Converted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/plat-orion')
| -rw-r--r-- | arch/arm/plat-orion/gpio.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-orion/irq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 9ea0ae4..a431a13 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c @@ -474,8 +474,8 @@ void __init orion_gpio_init(int gpio_base, int ngpio, for (i = 0; i < ngpio; i++) { unsigned int irq = secondary_irq_base + i; - irq_set_chip(irq, &orion_gpio_irq_chip); - irq_set_handler(irq, handle_level_irq); + irq_set_chip_and_handler(irq, &orion_gpio_irq_chip, + handle_level_irq); irq_set_chip_data(irq, ochip); irq_set_status_flags(irq, IRQ_LEVEL); set_irq_flags(irq, IRQF_VALID); diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c index f533bde..d8d638e 100644 --- a/arch/arm/plat-orion/irq.c +++ b/arch/arm/plat-orion/irq.c @@ -56,8 +56,8 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr) for (i = 0; i < 32; i++) { unsigned int irq = irq_start + i; - irq_set_chip(irq, &orion_irq_chip); - irq_set_handler(irq, handle_level_irq); + irq_set_chip_and_handler(irq, &orion_irq_chip, + handle_level_irq); irq_set_chip_data(irq, maskaddr); irq_set_status_flags(irq, IRQ_LEVEL); set_irq_flags(irq, IRQF_VALID); |
