All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/9] ARM: sa1100: convert SA11x0 related code to use new chained handler helper
@ 2015-06-16 22:06 ` Russell King
  0 siblings, 0 replies; 5+ messages in thread
From: Russell King @ 2015-06-16 22:06 UTC (permalink / raw)
  To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-gpio-u79uwXL29TY76Z2rM5mHXA,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Thomas Gleixner
  Cc: Alexandre Courbot, Hans Ulli Kroll, Jason Cooper, Lee Jones,
	Linus Walleij, Thierry Reding

Convert SA11x0 (Neponset, SA1111, and UCB1x00 code) to use the new
irq_set_chained_handler_and_data() helper.

Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
---
Depends on patch 1.

 arch/arm/common/sa1111.c        | 7 +++----
 arch/arm/mach-sa1100/neponset.c | 3 +--
 drivers/mfd/ucb1x00-core.c      | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 5cc779c8e9c6..93ee70dbbdd3 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -501,8 +501,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
 	 * Register SA1111 interrupt
 	 */
 	irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(sachip->irq, sachip);
-	irq_set_chained_handler(sachip->irq, sa1111_irq_handler);
+	irq_set_chained_handler_and_data(sachip->irq, sa1111_irq_handler,
+					 sachip);
 
 	dev_info(sachip->dev, "Providing IRQ%u-%u\n",
 		sachip->irq_base, sachip->irq_base + SA1111_IRQ_NR - 1);
@@ -836,8 +836,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
 	clk_unprepare(sachip->clk);
 
 	if (sachip->irq != NO_IRQ) {
-		irq_set_chained_handler(sachip->irq, NULL);
-		irq_set_handler_data(sachip->irq, NULL);
+		irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
 		irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
 
 		release_mem_region(sachip->phys + SA1111_INTC, 512);
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index af868d258e66..99d9a3b1bf34 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -327,8 +327,7 @@ static int neponset_probe(struct platform_device *dev)
 	irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip);
 
 	irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(irq, d);
-	irq_set_chained_handler(irq, neponset_irq_handler);
+	irq_set_chained_handler_and_data(irq, neponset_irq_handler, d);
 
 	/*
 	 * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 58ea9fdd3a15..3591550598ad 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -566,8 +566,7 @@ static int ucb1x00_probe(struct mcp *mcp)
 	}
 
 	irq_set_irq_type(ucb->irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(ucb->irq, ucb);
-	irq_set_chained_handler(ucb->irq, ucb1x00_irq);
+	irq_set_chained_handler_and_data(ucb->irq, ucb1x00_irq, ucb);
 
 	if (pdata && pdata->gpio_base) {
 		ucb->gpio.label = dev_name(&ucb->dev);
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 2/9] ARM: sa1100: convert SA11x0 related code to use new chained handler helper
@ 2015-06-16 22:06 ` Russell King
  0 siblings, 0 replies; 5+ messages in thread
From: Russell King @ 2015-06-16 22:06 UTC (permalink / raw)
  To: linux-arm-kernel

Convert SA11x0 (Neponset, SA1111, and UCB1x00 code) to use the new
irq_set_chained_handler_and_data() helper.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
Depends on patch 1.

 arch/arm/common/sa1111.c        | 7 +++----
 arch/arm/mach-sa1100/neponset.c | 3 +--
 drivers/mfd/ucb1x00-core.c      | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 5cc779c8e9c6..93ee70dbbdd3 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -501,8 +501,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
 	 * Register SA1111 interrupt
 	 */
 	irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(sachip->irq, sachip);
-	irq_set_chained_handler(sachip->irq, sa1111_irq_handler);
+	irq_set_chained_handler_and_data(sachip->irq, sa1111_irq_handler,
+					 sachip);
 
 	dev_info(sachip->dev, "Providing IRQ%u-%u\n",
 		sachip->irq_base, sachip->irq_base + SA1111_IRQ_NR - 1);
@@ -836,8 +836,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
 	clk_unprepare(sachip->clk);
 
 	if (sachip->irq != NO_IRQ) {
-		irq_set_chained_handler(sachip->irq, NULL);
-		irq_set_handler_data(sachip->irq, NULL);
+		irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
 		irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
 
 		release_mem_region(sachip->phys + SA1111_INTC, 512);
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index af868d258e66..99d9a3b1bf34 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -327,8 +327,7 @@ static int neponset_probe(struct platform_device *dev)
 	irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip);
 
 	irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(irq, d);
-	irq_set_chained_handler(irq, neponset_irq_handler);
+	irq_set_chained_handler_and_data(irq, neponset_irq_handler, d);
 
 	/*
 	 * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 58ea9fdd3a15..3591550598ad 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -566,8 +566,7 @@ static int ucb1x00_probe(struct mcp *mcp)
 	}
 
 	irq_set_irq_type(ucb->irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(ucb->irq, ucb);
-	irq_set_chained_handler(ucb->irq, ucb1x00_irq);
+	irq_set_chained_handler_and_data(ucb->irq, ucb1x00_irq, ucb);
 
 	if (pdata && pdata->gpio_base) {
 		ucb->gpio.label = dev_name(&ucb->dev);
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [tip:irq/core] ARM: sa1100: convert SA11x0 related code to use new chained handler helper
  2015-06-16 22:06 ` Russell King
  (?)
@ 2015-06-18 12:06 ` tip-bot for Russell King
  -1 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Russell King @ 2015-06-18 12:06 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: thierry.reding, mingo, rmk+kernel, gnurou, linux-kernel,
	lee.jones, hpa, tglx, linus.walleij, jason, ulli.kroll

Commit-ID:  056c0acf8798d3b94916633c41432d7a310b2f64
Gitweb:     http://git.kernel.org/tip/056c0acf8798d3b94916633c41432d7a310b2f64
Author:     Russell King <rmk+kernel@arm.linux.org.uk>
AuthorDate: Tue, 16 Jun 2015 23:06:25 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 18 Jun 2015 14:03:08 +0200

ARM: sa1100: convert SA11x0 related code to use new chained handler helper

Convert SA11x0 (Neponset, SA1111, and UCB1x00 code) to use the new
irq_set_chained_handler_and_data() helper.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/E1Z4yzx-0002S6-7p@rmk-PC.arm.linux.org.uk
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/arm/common/sa1111.c        | 7 +++----
 arch/arm/mach-sa1100/neponset.c | 3 +--
 drivers/mfd/ucb1x00-core.c      | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 5cc779c..93ee70d 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -501,8 +501,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
 	 * Register SA1111 interrupt
 	 */
 	irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(sachip->irq, sachip);
-	irq_set_chained_handler(sachip->irq, sa1111_irq_handler);
+	irq_set_chained_handler_and_data(sachip->irq, sa1111_irq_handler,
+					 sachip);
 
 	dev_info(sachip->dev, "Providing IRQ%u-%u\n",
 		sachip->irq_base, sachip->irq_base + SA1111_IRQ_NR - 1);
@@ -836,8 +836,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
 	clk_unprepare(sachip->clk);
 
 	if (sachip->irq != NO_IRQ) {
-		irq_set_chained_handler(sachip->irq, NULL);
-		irq_set_handler_data(sachip->irq, NULL);
+		irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
 		irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
 
 		release_mem_region(sachip->phys + SA1111_INTC, 512);
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index af868d25..99d9a3b 100644
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -327,8 +327,7 @@ static int neponset_probe(struct platform_device *dev)
 	irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip);
 
 	irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(irq, d);
-	irq_set_chained_handler(irq, neponset_irq_handler);
+	irq_set_chained_handler_and_data(irq, neponset_irq_handler, d);
 
 	/*
 	 * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 58ea9fd..3591550 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -566,8 +566,7 @@ static int ucb1x00_probe(struct mcp *mcp)
 	}
 
 	irq_set_irq_type(ucb->irq, IRQ_TYPE_EDGE_RISING);
-	irq_set_handler_data(ucb->irq, ucb);
-	irq_set_chained_handler(ucb->irq, ucb1x00_irq);
+	irq_set_chained_handler_and_data(ucb->irq, ucb1x00_irq, ucb);
 
 	if (pdata && pdata->gpio_base) {
 		ucb->gpio.label = dev_name(&ucb->dev);

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 2/9] ARM: sa1100: convert SA11x0 related code to use new chained handler helper
  2015-06-16 22:06 ` Russell King
@ 2015-06-22 10:59     ` Lee Jones
  -1 siblings, 0 replies; 5+ messages in thread
From: Lee Jones @ 2015-06-22 10:59 UTC (permalink / raw)
  To: Russell King
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-gpio-u79uwXL29TY76Z2rM5mHXA,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA, Thomas Gleixner,
	Alexandre Courbot, Hans Ulli Kroll, Jason Cooper, Linus Walleij,
	Thierry Reding

On Tue, 16 Jun 2015, Russell King wrote:

> Convert SA11x0 (Neponset, SA1111, and UCB1x00 code) to use the new
> irq_set_chained_handler_and_data() helper.
> 
> Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
> ---
> Depends on patch 1.
> 
>  arch/arm/common/sa1111.c        | 7 +++----
>  arch/arm/mach-sa1100/neponset.c | 3 +--
>  drivers/mfd/ucb1x00-core.c      | 3 +--

Acked-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

>  3 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
> index 5cc779c8e9c6..93ee70dbbdd3 100644
> --- a/arch/arm/common/sa1111.c
> +++ b/arch/arm/common/sa1111.c
> @@ -501,8 +501,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
>  	 * Register SA1111 interrupt
>  	 */
>  	irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
> -	irq_set_handler_data(sachip->irq, sachip);
> -	irq_set_chained_handler(sachip->irq, sa1111_irq_handler);
> +	irq_set_chained_handler_and_data(sachip->irq, sa1111_irq_handler,
> +					 sachip);
>  
>  	dev_info(sachip->dev, "Providing IRQ%u-%u\n",
>  		sachip->irq_base, sachip->irq_base + SA1111_IRQ_NR - 1);
> @@ -836,8 +836,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
>  	clk_unprepare(sachip->clk);
>  
>  	if (sachip->irq != NO_IRQ) {
> -		irq_set_chained_handler(sachip->irq, NULL);
> -		irq_set_handler_data(sachip->irq, NULL);
> +		irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
>  		irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
>  
>  		release_mem_region(sachip->phys + SA1111_INTC, 512);
> diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
> index af868d258e66..99d9a3b1bf34 100644
> --- a/arch/arm/mach-sa1100/neponset.c
> +++ b/arch/arm/mach-sa1100/neponset.c
> @@ -327,8 +327,7 @@ static int neponset_probe(struct platform_device *dev)
>  	irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip);
>  
>  	irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
> -	irq_set_handler_data(irq, d);
> -	irq_set_chained_handler(irq, neponset_irq_handler);
> +	irq_set_chained_handler_and_data(irq, neponset_irq_handler, d);
>  
>  	/*
>  	 * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately
> diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
> index 58ea9fdd3a15..3591550598ad 100644
> --- a/drivers/mfd/ucb1x00-core.c
> +++ b/drivers/mfd/ucb1x00-core.c
> @@ -566,8 +566,7 @@ static int ucb1x00_probe(struct mcp *mcp)
>  	}
>  
>  	irq_set_irq_type(ucb->irq, IRQ_TYPE_EDGE_RISING);
> -	irq_set_handler_data(ucb->irq, ucb);
> -	irq_set_chained_handler(ucb->irq, ucb1x00_irq);
> +	irq_set_chained_handler_and_data(ucb->irq, ucb1x00_irq, ucb);
>  
>  	if (pdata && pdata->gpio_base) {
>  		ucb->gpio.label = dev_name(&ucb->dev);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 2/9] ARM: sa1100: convert SA11x0 related code to use new chained handler helper
@ 2015-06-22 10:59     ` Lee Jones
  0 siblings, 0 replies; 5+ messages in thread
From: Lee Jones @ 2015-06-22 10:59 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, 16 Jun 2015, Russell King wrote:

> Convert SA11x0 (Neponset, SA1111, and UCB1x00 code) to use the new
> irq_set_chained_handler_and_data() helper.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
> Depends on patch 1.
> 
>  arch/arm/common/sa1111.c        | 7 +++----
>  arch/arm/mach-sa1100/neponset.c | 3 +--
>  drivers/mfd/ucb1x00-core.c      | 3 +--

Acked-by: Lee Jones <lee.jones@linaro.org>

>  3 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
> index 5cc779c8e9c6..93ee70dbbdd3 100644
> --- a/arch/arm/common/sa1111.c
> +++ b/arch/arm/common/sa1111.c
> @@ -501,8 +501,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
>  	 * Register SA1111 interrupt
>  	 */
>  	irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
> -	irq_set_handler_data(sachip->irq, sachip);
> -	irq_set_chained_handler(sachip->irq, sa1111_irq_handler);
> +	irq_set_chained_handler_and_data(sachip->irq, sa1111_irq_handler,
> +					 sachip);
>  
>  	dev_info(sachip->dev, "Providing IRQ%u-%u\n",
>  		sachip->irq_base, sachip->irq_base + SA1111_IRQ_NR - 1);
> @@ -836,8 +836,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
>  	clk_unprepare(sachip->clk);
>  
>  	if (sachip->irq != NO_IRQ) {
> -		irq_set_chained_handler(sachip->irq, NULL);
> -		irq_set_handler_data(sachip->irq, NULL);
> +		irq_set_chained_handler_and_data(sachip->irq, NULL, NULL);
>  		irq_free_descs(sachip->irq_base, SA1111_IRQ_NR);
>  
>  		release_mem_region(sachip->phys + SA1111_INTC, 512);
> diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
> index af868d258e66..99d9a3b1bf34 100644
> --- a/arch/arm/mach-sa1100/neponset.c
> +++ b/arch/arm/mach-sa1100/neponset.c
> @@ -327,8 +327,7 @@ static int neponset_probe(struct platform_device *dev)
>  	irq_set_chip(d->irq_base + NEP_IRQ_SA1111, &nochip);
>  
>  	irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
> -	irq_set_handler_data(irq, d);
> -	irq_set_chained_handler(irq, neponset_irq_handler);
> +	irq_set_chained_handler_and_data(irq, neponset_irq_handler, d);
>  
>  	/*
>  	 * We would set IRQ_GPIO25 to be a wake-up IRQ, but unfortunately
> diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
> index 58ea9fdd3a15..3591550598ad 100644
> --- a/drivers/mfd/ucb1x00-core.c
> +++ b/drivers/mfd/ucb1x00-core.c
> @@ -566,8 +566,7 @@ static int ucb1x00_probe(struct mcp *mcp)
>  	}
>  
>  	irq_set_irq_type(ucb->irq, IRQ_TYPE_EDGE_RISING);
> -	irq_set_handler_data(ucb->irq, ucb);
> -	irq_set_chained_handler(ucb->irq, ucb1x00_irq);
> +	irq_set_chained_handler_and_data(ucb->irq, ucb1x00_irq, ucb);
>  
>  	if (pdata && pdata->gpio_base) {
>  		ucb->gpio.label = dev_name(&ucb->dev);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-22 10:59 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-16 22:06 [PATCH 2/9] ARM: sa1100: convert SA11x0 related code to use new chained handler helper Russell King
2015-06-16 22:06 ` Russell King
2015-06-18 12:06 ` [tip:irq/core] " tip-bot for Russell King
     [not found] ` <E1Z4yzx-0002S6-7p-eh5Bv4kxaXIANfyc6IWni62ZND6+EDdj@public.gmane.org>
2015-06-22 10:59   ` [PATCH 2/9] " Lee Jones
2015-06-22 10:59     ` Lee Jones

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.