[patch 0/3] avr32: Interrupt cleanups and API change preparation

[patch 0/3] avr32: Interrupt cleanups and API change preparation

[Thomas Gleixner]

The following patch series contains the following changes:

    - Consolidation of chained interrupt handler setup/removal

    - Switch to functions which avoid a redundant interrupt
      descriptor lookup

    - Preparation of interrupt flow handlers for the 'irq' argument
      removal

The series has no dependencies and is also available as a git branch
for your convenience:

 git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/avr32

If you want me to carry the patches in the irq/core branch of tip,
please let me know.

Thanks,

	tglx

[patch 1/3] avr32/at32ap: Consolidate chained IRQ handler install/remove

[Thomas Gleixner]

[-- Attachment #1: avr32-at32ap-Consolidate-chained-IRQ-handler-install.patch --]
[-- Type: text/plain, Size: 1275 bytes --]

Chained irq handlers usually set up handler data as well. We now have
a function to set both under irq_desc->lock. Replace the two calls
with one.

Search and conversion was done with coccinelle.

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
---
 arch/avr32/mach-at32ap/pio.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: tip/arch/avr32/mach-at32ap/pio.c
===================================================================
--- tip.orig/arch/avr32/mach-at32ap/pio.c
+++ tip/arch/avr32/mach-at32ap/pio.c
@@ -312,7 +312,6 @@ gpio_irq_setup(struct pio_device *pio, i
 	unsigned	i;
 
 	irq_set_chip_data(irq, pio);
-	irq_set_handler_data(irq, (void *)gpio_irq);
 
 	for (i = 0; i < 32; i++, gpio_irq++) {
 		irq_set_chip_data(gpio_irq, pio);
@@ -320,7 +319,8 @@ gpio_irq_setup(struct pio_device *pio, i
 					 handle_simple_irq);
 	}
 
-	irq_set_chained_handler(irq, gpio_irq_handler);
+	irq_set_chained_handler_and_data(irq, gpio_irq_handler,
+					 (void *)gpio_irq);
 }
 
 /*--------------------------------------------------------------------------*/

[patch 2/3] avr32/at32ap: Use irq_set_handler_locked()

[Thomas Gleixner]

[-- Attachment #1: avr32-at32ap-Use-irq_set_handler_locked.patch --]
[-- Type: text/plain, Size: 1070 bytes --]

Use irq_set_handler_locked() as it avoids a redundant lookup of the
irq descriptor.

Search and replacement was done with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
---
 arch/avr32/mach-at32ap/extint.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: tip/arch/avr32/mach-at32ap/extint.c
===================================================================
--- tip.orig/arch/avr32/mach-at32ap/extint.c
+++ tip/arch/avr32/mach-at32ap/extint.c
@@ -128,9 +128,9 @@ static int eic_set_irq_type(struct irq_d
 
 	irqd_set_trigger_type(d, flow_type);
 	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
-		__irq_set_handler_locked(irq, handle_level_irq);
+		irq_set_handler_locked(d, handle_level_irq);
 	else
-		__irq_set_handler_locked(irq, handle_edge_irq);
+		irq_set_handler_locked(d, handle_edge_irq);
 
 	return IRQ_SET_MASK_OK_NOCOPY;
 }

[patch 3/3] avr32/irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc

[Thomas Gleixner]

[-- Attachment #1: avr32-irq-Use-irq_desc_get_xxx-to-avoid-redundant-lo.patch --]
[-- Type: text/plain, Size: 933 bytes --]

From: Jiang Liu <jiang.liu@linux.intel.com>

Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
already have a pointer to corresponding irq_desc.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/avr32/mach-at32ap/pio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: tip/arch/avr32/mach-at32ap/pio.c
===================================================================
--- tip.orig/arch/avr32/mach-at32ap/pio.c
+++ tip/arch/avr32/mach-at32ap/pio.c
@@ -286,7 +286,7 @@ static void gpio_irq_handler(unsigned ir
 	struct pio_device	*pio = irq_desc_get_chip_data(desc);
 	unsigned		gpio_irq;
 
-	gpio_irq = (unsigned) irq_get_handler_data(irq);
+	gpio_irq = (unsigned) irq_desc_get_handler_data(desc);
 	for (;;) {
 		u32		isr;
 

Re: [patch 1/3] avr32/at32ap: Consolidate chained IRQ handler install/remove

[Hans-Christian Egtvedt]

Around Mon 13 Jul 2015 20:31:09 -0000 or thereabout, Thomas Gleixner wrote:
> Chained irq handlers usually set up handler data as well. We now have
> a function to set both under irq_desc->lock. Replace the two calls
> with one.
> 
> Search and conversion was done with coccinelle.
> 
> Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Julia Lawall <Julia.Lawall@lip6.fr>
> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>

Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>

> ---
>  arch/avr32/mach-at32ap/pio.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: tip/arch/avr32/mach-at32ap/pio.c
> ===================================================================
> --- tip.orig/arch/avr32/mach-at32ap/pio.c
> +++ tip/arch/avr32/mach-at32ap/pio.c
> @@ -312,7 +312,6 @@ gpio_irq_setup(struct pio_device *pio, i
>  	unsigned	i;
>  
>  	irq_set_chip_data(irq, pio);
> -	irq_set_handler_data(irq, (void *)gpio_irq);
>  
>  	for (i = 0; i < 32; i++, gpio_irq++) {
>  		irq_set_chip_data(gpio_irq, pio);
> @@ -320,7 +319,8 @@ gpio_irq_setup(struct pio_device *pio, i
>  					 handle_simple_irq);
>  	}
>  
> -	irq_set_chained_handler(irq, gpio_irq_handler);
> +	irq_set_chained_handler_and_data(irq, gpio_irq_handler,
> +					 (void *)gpio_irq);
>  }
>  
>  /*--------------------------------------------------------------------------*/
-- 
mvh
Hans-Christian Egtvedt

Re: [patch 2/3] avr32/at32ap: Use irq_set_handler_locked()

[Hans-Christian Egtvedt]

Around Mon 13 Jul 2015 20:31:10 -0000 or thereabout, Thomas Gleixner wrote:
> Use irq_set_handler_locked() as it avoids a redundant lookup of the
> irq descriptor.
> 
> Search and replacement was done with coccinelle.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Jiang Liu <jiang.liu@linux.intel.com>
> Cc: Julia Lawall <julia.lawall@lip6.fr>
> Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
> Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>

Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>

> ---
>  arch/avr32/mach-at32ap/extint.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: tip/arch/avr32/mach-at32ap/extint.c
> ===================================================================
> --- tip.orig/arch/avr32/mach-at32ap/extint.c
> +++ tip/arch/avr32/mach-at32ap/extint.c
> @@ -128,9 +128,9 @@ static int eic_set_irq_type(struct irq_d
>  
>  	irqd_set_trigger_type(d, flow_type);
>  	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
> -		__irq_set_handler_locked(irq, handle_level_irq);
> +		irq_set_handler_locked(d, handle_level_irq);
>  	else
> -		__irq_set_handler_locked(irq, handle_edge_irq);
> +		irq_set_handler_locked(d, handle_edge_irq);
>  
>  	return IRQ_SET_MASK_OK_NOCOPY;
>  }
-- 
mvh
Hans-Christian Egtvedt

[tip:irq/core] avr32/at32ap: Consolidate chained IRQ handler install/remove

[tip-bot for Thomas Gleixner]

Commit-ID:  4365160def95ef2f5da9b5cc5660e5747e5e1956
Gitweb:     http://git.kernel.org/tip/4365160def95ef2f5da9b5cc5660e5747e5e1956
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Mon, 13 Jul 2015 20:31:09 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 26 Jul 2015 11:47:25 +0200

avr32/at32ap: Consolidate chained IRQ handler install/remove

Chained irq handlers usually set up handler data as well. We now have
a function to set both under irq_desc->lock. Replace the two calls
with one.

Search and conversion was done with coccinelle.

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Link: http://lkml.kernel.org/r/20150713100606.351640193@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/avr32/mach-at32ap/pio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 903c7d8..6c7035a 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -312,7 +312,6 @@ gpio_irq_setup(struct pio_device *pio, int irq, int gpio_irq)
 	unsigned	i;
 
 	irq_set_chip_data(irq, pio);
-	irq_set_handler_data(irq, (void *)gpio_irq);
 
 	for (i = 0; i < 32; i++, gpio_irq++) {
 		irq_set_chip_data(gpio_irq, pio);
@@ -320,7 +319,8 @@ gpio_irq_setup(struct pio_device *pio, int irq, int gpio_irq)
 					 handle_simple_irq);
 	}
 
-	irq_set_chained_handler(irq, gpio_irq_handler);
+	irq_set_chained_handler_and_data(irq, gpio_irq_handler,
+					 (void *)gpio_irq);
 }
 
 /*--------------------------------------------------------------------------*/

[tip:irq/core] avr32/at32ap: Use irq_set_handler_locked()

[tip-bot for Thomas Gleixner]

Commit-ID:  4f31dd63e050b777d3f3139197c4b3860aa89301
Gitweb:     http://git.kernel.org/tip/4f31dd63e050b777d3f3139197c4b3860aa89301
Author:     Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Mon, 13 Jul 2015 20:31:10 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 26 Jul 2015 11:47:25 +0200

avr32/at32ap: Use irq_set_handler_locked()

Use irq_set_handler_locked() as it avoids a redundant lookup of the
irq descriptor.

Search and replacement was done with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Link: http://lkml.kernel.org/r/20150713100606.448031045@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/avr32/mach-at32ap/extint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index 2d48b6a..d51ff8f 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -128,9 +128,9 @@ static int eic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 
 	irqd_set_trigger_type(d, flow_type);
 	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
-		__irq_set_handler_locked(irq, handle_level_irq);
+		irq_set_handler_locked(d, handle_level_irq);
 	else
-		__irq_set_handler_locked(irq, handle_edge_irq);
+		irq_set_handler_locked(d, handle_edge_irq);
 
 	return IRQ_SET_MASK_OK_NOCOPY;
 }

[tip:irq/core] avr32/irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc

[tip-bot for Jiang Liu]

Commit-ID:  df6e23ae62d46a524ba3db95a201904a01419bdc
Gitweb:     http://git.kernel.org/tip/df6e23ae62d46a524ba3db95a201904a01419bdc
Author:     Jiang Liu <jiang.liu@linux.intel.com>
AuthorDate: Mon, 13 Jul 2015 20:31:12 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 26 Jul 2015 11:47:25 +0200

avr32/irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc

Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
already have a pointer to corresponding irq_desc.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Link: http://lkml.kernel.org/r/20150713100606.527106283@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/avr32/mach-at32ap/pio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 6c7035a..157a5e0 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -286,7 +286,7 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 	struct pio_device	*pio = irq_desc_get_chip_data(desc);
 	unsigned		gpio_irq;
 
-	gpio_irq = (unsigned) irq_get_handler_data(irq);
+	gpio_irq = (unsigned) irq_desc_get_handler_data(desc);
 	for (;;) {
 		u32		isr;