[GIT PULL v2 0/2] Update for Renesas INTC External IRQ pin driver for v3.11

[GIT PULL v2 0/2] Update for Renesas INTC External IRQ pin driver for v3.11

[Simon Horman]

Hi Olof, Hi Arnd,

The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:

  Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-intc-external-irq-for-v3.11

for you to fetch changes up to 0d7c1210992ff05ee8de5d2c790defded3856f29:

  irqchip: Add irqchip_init dummy function (2013-06-06 10:23:58 +0900)

----------------------------------------------------------------
Update for Renesas INTC External IRQ pin driver for v3.11

Correct error handing in irqc_probe
Add irqchip_init dummy function

----------------------------------------------------------------
Axel Lin (1):
      irqchip: renesas-irqc: Fix irqc_probe error handling

Bastian Hecht (1):
      irqchip: Add irqchip_init dummy function

 drivers/irqchip/irq-renesas-irqc.c | 4 ++--
 include/linux/irqchip.h            | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

[PATCH 1/2] irqchip: renesas-irqc: Fix irqc_probe error handling

[Simon Horman]

From: Axel Lin <axel.lin@ingics.com>

The code in goto err3 path is wrong because it will call fee_irq() with k = 0,
which means it does free_irq(p->irq[-1].requested_irq, &p->irq[-1]);

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 drivers/irqchip/irq-renesas-irqc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 927bff3..2f404ba 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -248,8 +248,8 @@ static int irqc_probe(struct platform_device *pdev)
 
 	return 0;
 err3:
-	for (; k >= 0; k--)
-		free_irq(p->irq[k - 1].requested_irq, &p->irq[k - 1]);
+	while (--k >= 0)
+		free_irq(p->irq[k].requested_irq, &p->irq[k]);
 
 	irq_domain_remove(p->irq_domain);
 err2:
-- 
1.8.2.1

[PATCH 2/2] irqchip: Add irqchip_init dummy function

[Simon Horman]

From: Bastian Hecht <hechtb@gmail.com>

We add an empty irqchip_init dummy function for cases in which
CONFIG_IRQCHIP is not used. In these cases irqchip.c is not compiled,
but a funtion call may still be present in architecture code, that in
runtime doesn't get hit.

E.g. this is needed in the arch/arm/mach-shmobile/intc-r8a7740.c
interrupt setup code where OF use and non OF us is both handled in one
file.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
[horms+renesas@verge.net.au: Make non-CONFIG_IRQCHIP version static inline
 and remove trailing ';'.]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 include/linux/irqchip.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h
index e0006f1..14d7913 100644
--- a/include/linux/irqchip.h
+++ b/include/linux/irqchip.h
@@ -11,6 +11,10 @@
 #ifndef _LINUX_IRQCHIP_H
 #define _LINUX_IRQCHIP_H
 
+#ifdef CONFIG_IRQCHIP
 void irqchip_init(void);
+#else
+static inline void irqchip_init(void) {}
+#endif
 
 #endif
-- 
1.8.2.1

Re: [GIT PULL v2 0/2] Update for Renesas INTC External IRQ pin driver for v3.11

[Olof Johansson]

On Thu, Jun 06, 2013 at 04:28:46PM +0900, Simon Horman wrote:
> Hi Olof, Hi Arnd,
> 
> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:
> 
>   Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-intc-external-irq-for-v3.11

Thanks, I've merged this into next/fixes-non-critical.


-Olof