* [PATCH v2 00/02] irqchip: renesas-irqc: r8a7795 and generic chip update V2 @ 2015-09-28 9:42 Magnus Damm 2015-09-28 9:42 ` [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation Magnus Damm 2015-09-28 9:42 ` [PATCH v2 02/02] irqchip: renesas-irqc: Move over to nested generic chip Magnus Damm 0 siblings, 2 replies; 6+ messages in thread From: Magnus Damm @ 2015-09-28 9:42 UTC (permalink / raw) To: linux-sh; +Cc: jason, geert+renesas, linux-kernel, horms, Magnus Damm, tglx irqchip: renesas-irqc: r8a7795 and generic chip update V2 [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation [PATCH v2 02/02] irqchip: renesas-irqc: Move over to nested generic chip This series updates the IRQC driver with generic chip support including nested locking. Also the DT documentation is extended with r8a7795 support. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> --- Written against v4.3-rc3, thanks to Geert and Tglx for their help! Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt | 1 drivers/irqchip/Kconfig | 1 drivers/irqchip/irq-renesas-irqc.c | 86 +++------- ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation 2015-09-28 9:42 [PATCH v2 00/02] irqchip: renesas-irqc: r8a7795 and generic chip update V2 Magnus Damm @ 2015-09-28 9:42 ` Magnus Damm 2015-09-29 0:29 ` Simon Horman 2015-09-29 18:45 ` [tip:irq/core] irqchip/renesas-irqc: " tip-bot for Magnus Damm 2015-09-28 9:42 ` [PATCH v2 02/02] irqchip: renesas-irqc: Move over to nested generic chip Magnus Damm 1 sibling, 2 replies; 6+ messages in thread From: Magnus Damm @ 2015-09-28 9:42 UTC (permalink / raw) To: linux-sh; +Cc: jason, geert+renesas, linux-kernel, horms, Magnus Damm, tglx From: Magnus Damm <damm+renesas@opensource.se> For some reason the name of the external interrupt controller has changed name with r8a7795, so use "intc-ex" instead of "irqc" as r8a7795 compat string to follow the friendly documentation. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Changes since V1: - Use "intc-ex" instead of "irqc" to follow the data sheet. - Added ack from Geert. Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt | 1 + 1 file changed, 1 insertion(+) --- 0001/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt +++ work/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt 2015-09-28 18:12:43.250513000 +0900 @@ -10,6 +10,7 @@ Required properties: - "renesas,irqc-r8a7792" (R-Car V2H) - "renesas,irqc-r8a7793" (R-Car M2-N) - "renesas,irqc-r8a7794" (R-Car E2) + - "renesas,intc-ex-r8a7795" (R-Car H3) - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in interrupts.txt in this directory - clocks: Must contain a reference to the functional clock. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation 2015-09-28 9:42 ` [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation Magnus Damm @ 2015-09-29 0:29 ` Simon Horman 2015-09-29 18:45 ` [tip:irq/core] irqchip/renesas-irqc: " tip-bot for Magnus Damm 1 sibling, 0 replies; 6+ messages in thread From: Simon Horman @ 2015-09-29 0:29 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-sh, jason, geert+renesas, linux-kernel, tglx On Mon, Sep 28, 2015 at 06:42:28PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > For some reason the name of the external interrupt controller > has changed name with r8a7795, so use "intc-ex" instead of "irqc" > as r8a7795 compat string to follow the friendly documentation. > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > > Changes since V1: > - Use "intc-ex" instead of "irqc" to follow the data sheet. > - Added ack from Geert. > > Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt | 1 + > 1 file changed, 1 insertion(+) > > --- 0001/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt > +++ work/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt 2015-09-28 18:12:43.250513000 +0900 > @@ -10,6 +10,7 @@ Required properties: > - "renesas,irqc-r8a7792" (R-Car V2H) > - "renesas,irqc-r8a7793" (R-Car M2-N) > - "renesas,irqc-r8a7794" (R-Car E2) > + - "renesas,intc-ex-r8a7795" (R-Car H3) > - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in > interrupts.txt in this directory > - clocks: Must contain a reference to the functional clock. > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:irq/core] irqchip/renesas-irqc: Add r8a7795 INTC-EX DT documentation 2015-09-28 9:42 ` [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation Magnus Damm 2015-09-29 0:29 ` Simon Horman @ 2015-09-29 18:45 ` tip-bot for Magnus Damm 1 sibling, 0 replies; 6+ messages in thread From: tip-bot for Magnus Damm @ 2015-09-29 18:45 UTC (permalink / raw) To: linux-tip-commits Cc: tglx, hpa, geert+renesas, mingo, linux-kernel, magnus.damm, damm+renesas Commit-ID: e7dbe2da5e8e247c6e62a0894935d94d7153ed16 Gitweb: http://git.kernel.org/tip/e7dbe2da5e8e247c6e62a0894935d94d7153ed16 Author: Magnus Damm <damm+renesas@opensource.se> AuthorDate: Mon, 28 Sep 2015 18:42:28 +0900 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 29 Sep 2015 20:41:00 +0200 irqchip/renesas-irqc: Add r8a7795 INTC-EX DT documentation For some reason the name of the external interrupt controller has changed name with r8a7795, so use "intc-ex" instead of "irqc" as r8a7795 compat string to follow the friendly documentation. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Reviewed-by: horms@verge.net.au Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Cc: jason@lakedaemon.net Cc: Magnus Damm <magnus.damm@gmail.com> Link: http://lkml.kernel.org/r/20150928094228.32552.83336.sendpatchset@little-apple Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt index 63633bd..ae5054c 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt @@ -10,6 +10,7 @@ Required properties: - "renesas,irqc-r8a7792" (R-Car V2H) - "renesas,irqc-r8a7793" (R-Car M2-N) - "renesas,irqc-r8a7794" (R-Car E2) + - "renesas,intc-ex-r8a7795" (R-Car H3) - #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in interrupts.txt in this directory - clocks: Must contain a reference to the functional clock. ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 02/02] irqchip: renesas-irqc: Move over to nested generic chip 2015-09-28 9:42 [PATCH v2 00/02] irqchip: renesas-irqc: r8a7795 and generic chip update V2 Magnus Damm 2015-09-28 9:42 ` [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation Magnus Damm @ 2015-09-28 9:42 ` Magnus Damm 2015-09-29 18:45 ` [tip:irq/core] irqchip/renesas-irqc: " tip-bot for Magnus Damm 1 sibling, 1 reply; 6+ messages in thread From: Magnus Damm @ 2015-09-28 9:42 UTC (permalink / raw) To: linux-sh; +Cc: jason, geert+renesas, linux-kernel, horms, Magnus Damm, tglx From: Magnus Damm <damm+renesas@opensource.se> Convert the IRQC driver to rely on GENERIC_IRQ_CHIP and set IRQ_GC_INIT_NESTED_LOCK to enable nested locking. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> --- Changes since V1: - rebased on top of v4.3-rc3 - folded in the IRQ_GC_INIT_NESTED_LOCK bits drivers/irqchip/Kconfig | 1 drivers/irqchip/irq-renesas-irqc.c | 86 ++++++++++++------------------------ 2 files changed, 31 insertions(+), 56 deletions(-) --- 0001/drivers/irqchip/Kconfig +++ work/drivers/irqchip/Kconfig 2015-09-28 17:41:51.240513000 +0900 @@ -123,6 +123,7 @@ config RENESAS_INTC_IRQPIN config RENESAS_IRQC bool + select GENERIC_IRQ_CHIP select IRQ_DOMAIN config ST_IRQCHIP --- 0001/drivers/irqchip/irq-renesas-irqc.c +++ work/drivers/irqchip/irq-renesas-irqc.c 2015-09-28 17:48:55.080513000 +0900 @@ -62,33 +62,20 @@ struct irqc_priv { struct irqc_irq irq[IRQC_IRQ_MAX]; unsigned int number_of_irqs; struct platform_device *pdev; - struct irq_chip irq_chip; + struct irq_chip_generic *gc; struct irq_domain *irq_domain; struct clk *clk; }; -static void irqc_dbg(struct irqc_irq *i, char *str) +static struct irqc_priv *irq_data_to_priv(struct irq_data *data) { - dev_dbg(&i->p->pdev->dev, "%s (%d:%d)\n", - str, i->requested_irq, i->hw_irq); + return data->domain->host_data; } -static void irqc_irq_enable(struct irq_data *d) -{ - struct irqc_priv *p = irq_data_get_irq_chip_data(d); - int hw_irq = irqd_to_hwirq(d); - - irqc_dbg(&p->irq[hw_irq], "enable"); - iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_SET); -} - -static void irqc_irq_disable(struct irq_data *d) +static void irqc_dbg(struct irqc_irq *i, char *str) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); - int hw_irq = irqd_to_hwirq(d); - - irqc_dbg(&p->irq[hw_irq], "disable"); - iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS); + dev_dbg(&i->p->pdev->dev, "%s (%d:%d)\n", + str, i->requested_irq, i->hw_irq); } static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = { @@ -101,7 +88,7 @@ static unsigned char irqc_sense[IRQ_TYPE static int irqc_irq_set_type(struct irq_data *d, unsigned int type) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); + struct irqc_priv *p = irq_data_to_priv(d); int hw_irq = irqd_to_hwirq(d); unsigned char value = irqc_sense[type & IRQ_TYPE_SENSE_MASK]; u32 tmp; @@ -120,7 +107,7 @@ static int irqc_irq_set_type(struct irq_ static int irqc_irq_set_wake(struct irq_data *d, unsigned int on) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); + struct irqc_priv *p = irq_data_to_priv(d); int hw_irq = irqd_to_hwirq(d); irq_set_irq_wake(p->irq[hw_irq].requested_irq, on); @@ -153,35 +140,11 @@ static irqreturn_t irqc_irq_handler(int return IRQ_NONE; } -/* - * This lock class tells lockdep that IRQC irqs are in a different - * category than their parents, so it won't report false recursion. - */ -static struct lock_class_key irqc_irq_lock_class; - -static int irqc_irq_domain_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) -{ - struct irqc_priv *p = h->host_data; - - irqc_dbg(&p->irq[hw], "map"); - irq_set_chip_data(virq, h->host_data); - irq_set_lockdep_class(virq, &irqc_irq_lock_class); - irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq); - return 0; -} - -static const struct irq_domain_ops irqc_irq_domain_ops = { - .map = irqc_irq_domain_map, - .xlate = irq_domain_xlate_twocell, -}; - static int irqc_probe(struct platform_device *pdev) { struct irqc_priv *p; struct resource *io; struct resource *irq; - struct irq_chip *irq_chip; const char *name = dev_name(&pdev->dev); int ret; int k; @@ -241,40 +204,51 @@ static int irqc_probe(struct platform_de p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */ - irq_chip = &p->irq_chip; - irq_chip->name = name; - irq_chip->irq_mask = irqc_irq_disable; - irq_chip->irq_unmask = irqc_irq_enable; - irq_chip->irq_set_type = irqc_irq_set_type; - irq_chip->irq_set_wake = irqc_irq_set_wake; - irq_chip->flags = IRQCHIP_MASK_ON_SUSPEND; - p->irq_domain = irq_domain_add_linear(pdev->dev.of_node, p->number_of_irqs, - &irqc_irq_domain_ops, p); + &irq_generic_chip_ops, p); if (!p->irq_domain) { ret = -ENXIO; dev_err(&pdev->dev, "cannot initialize irq domain\n"); goto err2; } + ret = irq_alloc_domain_generic_chips(p->irq_domain, p->number_of_irqs, + 1, name, handle_level_irq, + 0, 0, IRQ_GC_INIT_NESTED_LOCK); + if (ret) { + dev_err(&pdev->dev, "cannot allocate generic chip\n"); + goto err3; + } + + p->gc = irq_get_domain_generic_chip(p->irq_domain, 0); + p->gc->reg_base = p->cpu_int_base; + p->gc->chip_types[0].regs.enable = IRQC_EN_SET; + p->gc->chip_types[0].regs.disable = IRQC_EN_STS; + p->gc->chip_types[0].chip.irq_mask = irq_gc_mask_disable_reg; + p->gc->chip_types[0].chip.irq_unmask = irq_gc_unmask_enable_reg; + p->gc->chip_types[0].chip.irq_set_type = irqc_irq_set_type; + p->gc->chip_types[0].chip.irq_set_wake = irqc_irq_set_wake; + p->gc->chip_types[0].chip.flags = IRQCHIP_MASK_ON_SUSPEND; + /* request interrupts one by one */ for (k = 0; k < p->number_of_irqs; k++) { if (request_irq(p->irq[k].requested_irq, irqc_irq_handler, 0, name, &p->irq[k])) { dev_err(&pdev->dev, "failed to request IRQ\n"); ret = -ENOENT; - goto err3; + goto err4; } } dev_info(&pdev->dev, "driving %d irqs\n", p->number_of_irqs); return 0; -err3: +err4: while (--k >= 0) free_irq(p->irq[k].requested_irq, &p->irq[k]); +err3: irq_domain_remove(p->irq_domain); err2: iounmap(p->iomem); ^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:irq/core] irqchip/renesas-irqc: Move over to nested generic chip 2015-09-28 9:42 ` [PATCH v2 02/02] irqchip: renesas-irqc: Move over to nested generic chip Magnus Damm @ 2015-09-29 18:45 ` tip-bot for Magnus Damm 0 siblings, 0 replies; 6+ messages in thread From: tip-bot for Magnus Damm @ 2015-09-29 18:45 UTC (permalink / raw) To: linux-tip-commits Cc: damm+renesas, mingo, linux-kernel, tglx, hpa, magnus.damm Commit-ID: 99c221df33fbfa1b30e15dee879eb0a9ae1be353 Gitweb: http://git.kernel.org/tip/99c221df33fbfa1b30e15dee879eb0a9ae1be353 Author: Magnus Damm <damm+renesas@opensource.se> AuthorDate: Mon, 28 Sep 2015 18:42:37 +0900 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 29 Sep 2015 20:41:00 +0200 irqchip/renesas-irqc: Move over to nested generic chip Convert the IRQC driver to rely on GENERIC_IRQ_CHIP and set IRQ_GC_INIT_NESTED_LOCK to enable nested locking. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Cc: jason@lakedaemon.net Cc: geert+renesas@glider.be Cc: horms@verge.net.au Cc: Magnus Damm <magnus.damm@gmail.com> Link: http://lkml.kernel.org/r/20150928094237.32552.83434.sendpatchset@little-apple Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-renesas-irqc.c | 86 +++++++++++++------------------------- 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 27b52c8..67d8027 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -123,6 +123,7 @@ config RENESAS_INTC_IRQPIN config RENESAS_IRQC bool + select GENERIC_IRQ_CHIP select IRQ_DOMAIN config ST_IRQCHIP diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c index 35bf97b..52304b1 100644 --- a/drivers/irqchip/irq-renesas-irqc.c +++ b/drivers/irqchip/irq-renesas-irqc.c @@ -62,33 +62,20 @@ struct irqc_priv { struct irqc_irq irq[IRQC_IRQ_MAX]; unsigned int number_of_irqs; struct platform_device *pdev; - struct irq_chip irq_chip; + struct irq_chip_generic *gc; struct irq_domain *irq_domain; struct clk *clk; }; -static void irqc_dbg(struct irqc_irq *i, char *str) -{ - dev_dbg(&i->p->pdev->dev, "%s (%d:%d)\n", - str, i->requested_irq, i->hw_irq); -} - -static void irqc_irq_enable(struct irq_data *d) +static struct irqc_priv *irq_data_to_priv(struct irq_data *data) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); - int hw_irq = irqd_to_hwirq(d); - - irqc_dbg(&p->irq[hw_irq], "enable"); - iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_SET); + return data->domain->host_data; } -static void irqc_irq_disable(struct irq_data *d) +static void irqc_dbg(struct irqc_irq *i, char *str) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); - int hw_irq = irqd_to_hwirq(d); - - irqc_dbg(&p->irq[hw_irq], "disable"); - iowrite32(BIT(hw_irq), p->cpu_int_base + IRQC_EN_STS); + dev_dbg(&i->p->pdev->dev, "%s (%d:%d)\n", + str, i->requested_irq, i->hw_irq); } static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = { @@ -101,7 +88,7 @@ static unsigned char irqc_sense[IRQ_TYPE_SENSE_MASK + 1] = { static int irqc_irq_set_type(struct irq_data *d, unsigned int type) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); + struct irqc_priv *p = irq_data_to_priv(d); int hw_irq = irqd_to_hwirq(d); unsigned char value = irqc_sense[type & IRQ_TYPE_SENSE_MASK]; u32 tmp; @@ -120,7 +107,7 @@ static int irqc_irq_set_type(struct irq_data *d, unsigned int type) static int irqc_irq_set_wake(struct irq_data *d, unsigned int on) { - struct irqc_priv *p = irq_data_get_irq_chip_data(d); + struct irqc_priv *p = irq_data_to_priv(d); int hw_irq = irqd_to_hwirq(d); irq_set_irq_wake(p->irq[hw_irq].requested_irq, on); @@ -153,35 +140,11 @@ static irqreturn_t irqc_irq_handler(int irq, void *dev_id) return IRQ_NONE; } -/* - * This lock class tells lockdep that IRQC irqs are in a different - * category than their parents, so it won't report false recursion. - */ -static struct lock_class_key irqc_irq_lock_class; - -static int irqc_irq_domain_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) -{ - struct irqc_priv *p = h->host_data; - - irqc_dbg(&p->irq[hw], "map"); - irq_set_chip_data(virq, h->host_data); - irq_set_lockdep_class(virq, &irqc_irq_lock_class); - irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq); - return 0; -} - -static const struct irq_domain_ops irqc_irq_domain_ops = { - .map = irqc_irq_domain_map, - .xlate = irq_domain_xlate_twocell, -}; - static int irqc_probe(struct platform_device *pdev) { struct irqc_priv *p; struct resource *io; struct resource *irq; - struct irq_chip *irq_chip; const char *name = dev_name(&pdev->dev); int ret; int k; @@ -241,40 +204,51 @@ static int irqc_probe(struct platform_device *pdev) p->cpu_int_base = p->iomem + IRQC_INT_CPU_BASE(0); /* SYS-SPI */ - irq_chip = &p->irq_chip; - irq_chip->name = name; - irq_chip->irq_mask = irqc_irq_disable; - irq_chip->irq_unmask = irqc_irq_enable; - irq_chip->irq_set_type = irqc_irq_set_type; - irq_chip->irq_set_wake = irqc_irq_set_wake; - irq_chip->flags = IRQCHIP_MASK_ON_SUSPEND; - p->irq_domain = irq_domain_add_linear(pdev->dev.of_node, p->number_of_irqs, - &irqc_irq_domain_ops, p); + &irq_generic_chip_ops, p); if (!p->irq_domain) { ret = -ENXIO; dev_err(&pdev->dev, "cannot initialize irq domain\n"); goto err2; } + ret = irq_alloc_domain_generic_chips(p->irq_domain, p->number_of_irqs, + 1, name, handle_level_irq, + 0, 0, IRQ_GC_INIT_NESTED_LOCK); + if (ret) { + dev_err(&pdev->dev, "cannot allocate generic chip\n"); + goto err3; + } + + p->gc = irq_get_domain_generic_chip(p->irq_domain, 0); + p->gc->reg_base = p->cpu_int_base; + p->gc->chip_types[0].regs.enable = IRQC_EN_SET; + p->gc->chip_types[0].regs.disable = IRQC_EN_STS; + p->gc->chip_types[0].chip.irq_mask = irq_gc_mask_disable_reg; + p->gc->chip_types[0].chip.irq_unmask = irq_gc_unmask_enable_reg; + p->gc->chip_types[0].chip.irq_set_type = irqc_irq_set_type; + p->gc->chip_types[0].chip.irq_set_wake = irqc_irq_set_wake; + p->gc->chip_types[0].chip.flags = IRQCHIP_MASK_ON_SUSPEND; + /* request interrupts one by one */ for (k = 0; k < p->number_of_irqs; k++) { if (request_irq(p->irq[k].requested_irq, irqc_irq_handler, 0, name, &p->irq[k])) { dev_err(&pdev->dev, "failed to request IRQ\n"); ret = -ENOENT; - goto err3; + goto err4; } } dev_info(&pdev->dev, "driving %d irqs\n", p->number_of_irqs); return 0; -err3: +err4: while (--k >= 0) free_irq(p->irq[k].requested_irq, &p->irq[k]); +err3: irq_domain_remove(p->irq_domain); err2: iounmap(p->iomem); ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-29 18:46 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-09-28 9:42 [PATCH v2 00/02] irqchip: renesas-irqc: r8a7795 and generic chip update V2 Magnus Damm 2015-09-28 9:42 ` [PATCH v2 01/02] irqchip: renesas-irqc: Add r8a7795 INTC-EX DT documentation Magnus Damm 2015-09-29 0:29 ` Simon Horman 2015-09-29 18:45 ` [tip:irq/core] irqchip/renesas-irqc: " tip-bot for Magnus Damm 2015-09-28 9:42 ` [PATCH v2 02/02] irqchip: renesas-irqc: Move over to nested generic chip Magnus Damm 2015-09-29 18:45 ` [tip:irq/core] irqchip/renesas-irqc: " tip-bot for Magnus Damm
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox