2011-03-25 14:26:45

by Thomas Gleixner

Subject: [patch 1/2] unicore32: Convert to new irq function names

Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/unicore32/kernel/irq.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

Index: linux-2.6-tip/arch/unicore32/kernel/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/unicore32/kernel/irq.c
+++ linux-2.6-tip/arch/unicore32/kernel/irq.c
@@ -321,24 +321,24 @@ void __init init_IRQ(void)
writel(1, INTC_ICCR);

for (irq = 0; irq < IRQ_GPIOHIGH; irq++) {
- set_irq_chip(irq, &puv3_low_gpio_chip);
- set_irq_handler(irq, handle_edge_irq);
+ irq_set_chip(irq, &puv3_low_gpio_chip);
+ irq_set_handler(irq, handle_edge_irq);
irq_modify_status(irq,
IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN,
0);
}

for (irq = IRQ_GPIOHIGH + 1; irq < IRQ_GPIO0; irq++) {
- set_irq_chip(irq, &puv3_normal_chip);
- set_irq_handler(irq, handle_level_irq);
+ irq_set_chip(irq, &puv3_normal_chip);
+ irq_set_handler(irq, handle_level_irq);
irq_modify_status(irq,
IRQ_NOREQUEST | IRQ_NOAUTOEN,
IRQ_NOPROBE);
}

for (irq = IRQ_GPIO0; irq <= IRQ_GPIO27; irq++) {
- set_irq_chip(irq, &puv3_high_gpio_chip);
- set_irq_handler(irq, handle_edge_irq);
+ irq_set_chip(irq, &puv3_high_gpio_chip);
+ irq_set_handler(irq, handle_edge_irq);
irq_modify_status(irq,
IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN,
0);
@@ -347,8 +347,8 @@ void __init init_IRQ(void)
/*
* Install handler for GPIO 0-27 edge detect interrupts
*/
- set_irq_chip(IRQ_GPIOHIGH, &puv3_normal_chip);
- set_irq_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler);
+ irq_set_chip(IRQ_GPIOHIGH, &puv3_normal_chip);
+ irq_set_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler);

#ifdef CONFIG_PUV3_GPIO
puv3_init_gpio();

2011-03-29 14:09:55

by Xuetao Guan

Subject: RE: [patch 1/2] unicore32: Convert to new irq function names

Applied, thx.

Acked-by: Guan Xuetao <[email protected]>

> -----Original Message-----
> From: Thomas Gleixner [mailto:[email protected]]
> Sent: Friday, March 25, 2011 10:27 PM
> To: LKML
> Cc: Guan Xuetao
> Subject: [patch 1/2] unicore32: Convert to new irq function names
>
> Scripted with coccinelle.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> ---
> arch/unicore32/kernel/irq.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> Index: linux-2.6-tip/arch/unicore32/kernel/irq.c
> ===================================================================
> --- linux-2.6-tip.orig/arch/unicore32/kernel/irq.c
> +++ linux-2.6-tip/arch/unicore32/kernel/irq.c
> @@ -321,24 +321,24 @@ void __init init_IRQ(void)
> writel(1, INTC_ICCR);
>
> for (irq = 0; irq < IRQ_GPIOHIGH; irq++) {
> - set_irq_chip(irq, &puv3_low_gpio_chip);
> - set_irq_handler(irq, handle_edge_irq);
> + irq_set_chip(irq, &puv3_low_gpio_chip);
> + irq_set_handler(irq, handle_edge_irq);
> irq_modify_status(irq,
> IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN,
> 0);
> }
>
> for (irq = IRQ_GPIOHIGH + 1; irq < IRQ_GPIO0; irq++) {
> - set_irq_chip(irq, &puv3_normal_chip);
> - set_irq_handler(irq, handle_level_irq);
> + irq_set_chip(irq, &puv3_normal_chip);
> + irq_set_handler(irq, handle_level_irq);
> irq_modify_status(irq,
> IRQ_NOREQUEST | IRQ_NOAUTOEN,
> IRQ_NOPROBE);
> }
>
> for (irq = IRQ_GPIO0; irq <= IRQ_GPIO27; irq++) {
> - set_irq_chip(irq, &puv3_high_gpio_chip);
> - set_irq_handler(irq, handle_edge_irq);
> + irq_set_chip(irq, &puv3_high_gpio_chip);
> + irq_set_handler(irq, handle_edge_irq);
> irq_modify_status(irq,
> IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN,
> 0);
> @@ -347,8 +347,8 @@ void __init init_IRQ(void)
> /*
> * Install handler for GPIO 0-27 edge detect interrupts
> */
> - set_irq_chip(IRQ_GPIOHIGH, &puv3_normal_chip);
> - set_irq_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler);
> + irq_set_chip(IRQ_GPIOHIGH, &puv3_normal_chip);
> + irq_set_chained_handler(IRQ_GPIOHIGH, puv3_gpio_handler);
>
> #ifdef CONFIG_PUV3_GPIO
> puv3_init_gpio();