[PATCH 4/5] irq: Remove the IRQ_GC_INIT_NESTED_LOCK flag

[Bart Van Assche <bvanassche@acm.org>]

Remove the IRQ_GC_INIT_NESTED_LOCK flag since the previous patch removed
all code that tests this flag.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/gpio/gpio-mxc.c            | 3 +--
 drivers/gpio/gpio-mxs.c            | 3 +--
 drivers/irqchip/irq-imgpdc.c       | 3 +--
 drivers/irqchip/irq-renesas-irqc.c | 2 +-
 include/linux/irq.h                | 4 ----
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 619b6fb9d833..403e76d283a9 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -369,8 +369,7 @@ static int mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
 	ct->regs.ack = GPIO_ISR;
 	ct->regs.mask = GPIO_IMR;
 
-	rv = devm_irq_setup_generic_chip(port->dev, gc, IRQ_MSK(32),
-					 IRQ_GC_INIT_NESTED_LOCK,
+	rv = devm_irq_setup_generic_chip(port->dev, gc, IRQ_MSK(32), 0,
 					 IRQ_NOREQUEST, 0);
 
 	return rv;
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index 024ad077e98d..81f48727bff9 100644
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -221,8 +221,7 @@ static int mxs_gpio_init_gc(struct mxs_gpio_port *port, int irq_base)
 	ct->regs.disable = PINCTRL_IRQEN(port) + MXS_CLR;
 	ct->handler = handle_level_irq;
 
-	rv = devm_irq_setup_generic_chip(port->dev, gc, IRQ_MSK(32),
-					 IRQ_GC_INIT_NESTED_LOCK,
+	rv = devm_irq_setup_generic_chip(port->dev, gc, IRQ_MSK(32), 0,
 					 IRQ_NOREQUEST, 0);
 
 	return rv;
diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c
index 85f80bac0961..c6bb50af2bb3 100644
--- a/drivers/irqchip/irq-imgpdc.c
+++ b/drivers/irqchip/irq-imgpdc.c
@@ -385,8 +385,7 @@ static int pdc_intc_probe(struct platform_device *pdev)
 	 * The second one for syswake irqs (edge and level chip types)
 	 */
 	ret = irq_alloc_domain_generic_chips(priv->domain, 8, 2, "pdc",
-					     handle_level_irq, 0, 0,
-					     IRQ_GC_INIT_NESTED_LOCK);
+					     handle_level_irq, 0, 0, 0);
 	if (ret)
 		goto err_generic;
 
diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index cbce8ffc7de4..7ecd51e90daa 100644
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -178,7 +178,7 @@ static int irqc_probe(struct platform_device *pdev)
 
 	ret = irq_alloc_domain_generic_chips(p->irq_domain, p->number_of_irqs,
 					     1, "irqc", handle_level_irq,
-					     0, 0, IRQ_GC_INIT_NESTED_LOCK);
+					     0, 0, 0);
 	if (ret) {
 		dev_err(dev, "cannot allocate generic chip\n");
 		goto err_remove_domain;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 8daa17f0107a..c297fdeb61c6 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -1073,16 +1073,12 @@ struct irq_chip_generic {
 /**
  * enum irq_gc_flags - Initialization flags for generic irq chips
  * @IRQ_GC_INIT_MASK_CACHE:	Initialize the mask_cache by reading mask reg
- * @IRQ_GC_INIT_NESTED_LOCK:	Set the lock class of the irqs to nested for
- *				irq chips which need to call irq_set_wake() on
- *				the parent irq. Usually GPIO implementations
  * @IRQ_GC_MASK_CACHE_PER_TYPE:	Mask cache is chip type private
  * @IRQ_GC_NO_MASK:		Do not calculate irq_data->mask
  * @IRQ_GC_BE_IO:		Use big-endian register accesses (default: LE)
  */
 enum irq_gc_flags {
 	IRQ_GC_INIT_MASK_CACHE		= 1 << 0,
-	IRQ_GC_INIT_NESTED_LOCK		= 1 << 1,
 	IRQ_GC_MASK_CACHE_PER_TYPE	= 1 << 2,
 	IRQ_GC_NO_MASK			= 1 << 3,
 	IRQ_GC_BE_IO			= 1 << 4,