Skip to contentSkip to conversation

gpio: dwapb: Drop redundant check in dwapb_irq_set_type()

PATCH Applied Andy Shevchenko 3 participants 7 messages Jun 1, 2021 – Jun 2, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gpio: dwapb: Drop redundant check in dwapb_irq_set_type()

For more than 15 years we may not get into ->irq_set_type() without any meaningful type provided.

Drop redundant check in dwapb_irq_set_type().

See the commit e76de9f8eb67 ("[PATCH] genirq: add SA_TRIGGER support") out of curiosity.

---
 drivers/gpio/gpio-dwapb.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpio/gpio-dwapb.c +0 -3
index d3233cc4b76b..939701c1465e 100644
@@ -297,9 +297,6 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
 	irq_hw_number_t bit = irqd_to_hwirq(d);
 	unsigned long level, polarity, flags;
 
-	if (type & ~IRQ_TYPE_SENSE_MASK)
-		return -EINVAL;
-
 	spin_lock_irqsave(&gc->bgpio_lock, flags);
 	level = dwapb_read(gpio, GPIO_INTTYPE_LEVEL);
 	polarity = dwapb_read(gpio, GPIO_INT_POLARITY);
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 gpio: dwapb: Switch to use fwnode_irq_get()

We have open coded variant of fwnode_irq_get() in dwapb_get_irq(). Replace it with a simple call.

---
 drivers/gpio/gpio-dwapb.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpio/gpio-dwapb.c +4 -8
index 939701c1465e..7d61f5821e32 100644
@@ -528,17 +528,13 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
 static void dwapb_get_irq(struct device *dev, struct fwnode_handle *fwnode,
 			  struct dwapb_port_property *pp)
 {
-	struct device_node *np = NULL;
-	int irq = -ENXIO, j;
-
-	if (fwnode_property_read_bool(fwnode, "interrupt-controller"))
-		np = to_of_node(fwnode);
+	int irq, j;
 
 	for (j = 0; j < pp->ngpio; j++) {
-		if (np)
-			irq = of_irq_get(np, j);
-		else if (has_acpi_companion(dev))
+		if (has_acpi_companion(dev))
 			irq = platform_get_irq_optional(to_platform_device(dev), j);
+		else
+			irq = fwnode_irq_get(fwnode, j);
 		if (irq > 0)
 			pp->irq[j] = irq;
 	}
Signature · 1 line
2.30.2
#2 lore raw

Re: [PATCH v1 2/2] gpio: dwapb: Switch to use fwnode_irq_get()

Quoted 36 lines · Andy Shevchenko

We have open coded variant of fwnode_irq_get() in dwapb_get_irq(). Replace it with a simple call.

---
 drivers/gpio/gpio-dwapb.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpio/gpio-dwapb.c +4 -9
index 939701c1465e..7d61f5821e32 100644
@@ -528,17 +528,13 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
 static void dwapb_get_irq(struct device *dev, struct fwnode_handle *fwnode,
                          struct dwapb_port_property *pp)
 {
-       struct device_node *np = NULL;
-       int irq = -ENXIO, j;
-
-       if (fwnode_property_read_bool(fwnode, "interrupt-controller"))
-               np = to_of_node(fwnode);
+       int irq, j;
 
        for (j = 0; j < pp->ngpio; j++) {
-               if (np)
-                       irq = of_irq_get(np, j);
-               else if (has_acpi_companion(dev))
+               if (has_acpi_companion(dev))
                        irq = platform_get_irq_optional(to_platform_device(dev), j);
+               else
+                       irq = fwnode_irq_get(fwnode, j);
                if (irq > 0)
                        pp->irq[j] = irq;
        }
--
Quoted 2 lines

2.30.2

Applied, thanks!

Bart

Acked-by Tested-by on v1 2/2
#3 lore raw

Re: [PATCH v1 2/2] gpio: dwapb: Switch to use fwnode_irq_get()

In reply to Andy Shevchenko

Hello Andy

Quoted 2 lines · Andy Shevchenko

We have open coded variant of fwnode_irq_get() in dwapb_get_irq(). Replace it with a simple call.

Sometime ago I was trying to figure out a way to simplify this part of the driver by using the platform_get_irq_optional() method for both ACPI and OF cases. As you must have already found out by yourself it didn't work out because of DW APB GPIO DT-nodes are supposed to have sub-nodes with ports description. The OF-descriptors of these sub-nodes aren't touched by the platform_get_irq_optional() method, it just fails to detect IRQ-controller because it only works with the device OF-node. So I gave up and decided to leave the code as is. I can't remember now why I haven't used fwnode_irq_get() here. Most likely I just preferred a direct of_irq_get() invocation here just for clarity, since the only way we'd be calling fwnode_irq_get() here is to actually get IRQ number from the OF-node anyway, while the acpi_irq_get() method call made from the method fwnode_irq_get() will hardly ever be required here. If you think otherwise or I missing something please tell me.

Anyway by applying your patch at least we'll save a few lines of the code and may in future have swnode-base IRQs support in the fwnode_irq_get() method. So it still worths merging in. Thanks for suggesting this change.

-Sergey

Quoted 35 lines
---
 drivers/gpio/gpio-dwapb.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpio/gpio-dwapb.c +4 -8
index 939701c1465e..7d61f5821e32 100644
@@ -528,17 +528,13 @@ static int dwapb_gpio_add_port(struct dwapb_gpio *gpio,
 static void dwapb_get_irq(struct device *dev, struct fwnode_handle *fwnode,
 			  struct dwapb_port_property *pp)
 {
-	struct device_node *np = NULL;
-	int irq = -ENXIO, j;
-
-	if (fwnode_property_read_bool(fwnode, "interrupt-controller"))
-		np = to_of_node(fwnode);
+	int irq, j;
 
 	for (j = 0; j < pp->ngpio; j++) {
-		if (np)
-			irq = of_irq_get(np, j);
-		else if (has_acpi_companion(dev))
+		if (has_acpi_companion(dev))
 			irq = platform_get_irq_optional(to_platform_device(dev), j);
+		else
+			irq = fwnode_irq_get(fwnode, j);
 		if (irq > 0)
 			pp->irq[j] = irq;
 	}
Signature · 1 line
2.30.2
#4 lore raw

Re: [PATCH v1 2/2] gpio: dwapb: Switch to use fwnode_irq_get()

Quoted 20 lines · Serge Semin
Quoted 2 lines · Andy Shevchenko

We have open coded variant of fwnode_irq_get() in dwapb_get_irq(). Replace it with a simple call.

Sometime ago I was trying to figure out a way to simplify this part of the driver by using the platform_get_irq_optional() method for both ACPI and OF cases. As you must have already found out by yourself it didn't work out because of DW APB GPIO DT-nodes are supposed to have sub-nodes with ports description. The OF-descriptors of these sub-nodes aren't touched by the platform_get_irq_optional() method, it just fails to detect IRQ-controller because it only works with the device OF-node. So I gave up and decided to leave the code as is. I can't remember now why I haven't used fwnode_irq_get() here. Most likely I just preferred a direct of_irq_get() invocation here just for clarity, since the only way we'd be calling fwnode_irq_get() here is to actually get IRQ number from the OF-node anyway, while the acpi_irq_get() method call made from the method fwnode_irq_get() will hardly ever be required here. If you think otherwise or I missing something please tell me.

Quoted 7 lines

Anyway by applying your patch at least we'll save a few lines of the code and may in future have swnode-base IRQs support in the fwnode_irq_get() method. So it still worths merging in. Thanks for suggesting this change.

Thanks for testing!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw
In reply to Andy Shevchenko
Quoted 29 lines · Andy Shevchenko

For more than 15 years we may not get into ->irq_set_type() without any meaningful type provided.

Drop redundant check in dwapb_irq_set_type().

See the commit e76de9f8eb67 ("[PATCH] genirq: add SA_TRIGGER support") out of curiosity.

---
 drivers/gpio/gpio-dwapb.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpio/gpio-dwapb.c +0 -4
index d3233cc4b76b..939701c1465e 100644
@@ -297,9 +297,6 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
        irq_hw_number_t bit = irqd_to_hwirq(d);
        unsigned long level, polarity, flags;
 
-       if (type & ~IRQ_TYPE_SENSE_MASK)
-               return -EINVAL;
-
        spin_lock_irqsave(&gc->bgpio_lock, flags);
        level = dwapb_read(gpio, GPIO_INTTYPE_LEVEL);
        polarity = dwapb_read(gpio, GPIO_INT_POLARITY);
--
Quoted 2 lines

2.30.2

Applied, thanks!

Bart

Acked-by on v1 1/2
#6 lore raw
In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

For more than 15 years we may not get into ->irq_set_type() without any meaningful type provided.

Drop redundant check in dwapb_irq_set_type().

See the commit e76de9f8eb67 ("[PATCH] genirq: add SA_TRIGGER support") out of curiosity.

Why not. Thanks for the patch.

-Sergey

Quoted 23 lines
---
 drivers/gpio/gpio-dwapb.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpio/gpio-dwapb.c +0 -3
index d3233cc4b76b..939701c1465e 100644
@@ -297,9 +297,6 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
 	irq_hw_number_t bit = irqd_to_hwirq(d);
 	unsigned long level, polarity, flags;
 
-	if (type & ~IRQ_TYPE_SENSE_MASK)
-		return -EINVAL;
-
 	spin_lock_irqsave(&gc->bgpio_lock, flags);
 	level = dwapb_read(gpio, GPIO_INTTYPE_LEVEL);
 	polarity = dwapb_read(gpio, GPIO_INT_POLARITY);
Signature · 1 line
2.30.2