Skip to contentSkip to conversation

platform: don't return 0 from platform_get_irq[_byname]() on error

PATCH In review Sergei Shtylyov 2 participants 3 messages Jul 3, 2016 – Jul 25, 2016 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 platform: don't return 0 from platform_get_irq[_byname]() on error

of_irq_get[_byname]() return 0 iff irq_create_of_mapping() call fails. Returning both error code and 0 on failure is a sign of a misdesigned API, it makes the failure check unnecessarily complex and error prone. We should rely on the platform IRQ resource in this case, not return 0, especially as 0 can be a valid IRQ resource too...

Fixes aff008ad813c ("platform_get_irq: Revert to platform_get_resource if of_irq_get fails")

---
The patch is against the 'driver-core-linus' branch of Greg KH's 'driver-core.git' repo.

See also commit 3993546646ba ("of: irq: fix of_irq_get[_byname]() kernel-doc")

Changes in version 2:
- expanded the changelog.

 drivers/base/platform.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/platform.c +2 -2
Index: driver-core/drivers/base/platform.c
===================================================================
@@ -97,7 +97,7 @@ int platform_get_irq(struct platform_dev
 		int ret;
 
 		ret = of_irq_get(dev->dev.of_node, num);
-		if (ret >= 0 || ret == -EPROBE_DEFER)
+		if (ret > 0 || ret == -EPROBE_DEFER)
 			return ret;
 	}
 
@@ -175,7 +175,7 @@ int platform_get_irq_byname(struct platf
 		int ret;
 
 		ret = of_irq_get_byname(dev->dev.of_node, name);
-		if (ret >= 0 || ret == -EPROBE_DEFER)
+		if (ret > 0 || ret == -EPROBE_DEFER)
 			return ret;
 	}
 
#1 lore raw

Hello.

Quoted 9 lines · Sergei Shtylyov

of_irq_get[_byname]() return 0 iff irq_create_of_mapping() call fails. Returning both error code and 0 on failure is a sign of a misdesigned API, it makes the failure check unnecessarily complex and error prone. We should rely on the platform IRQ resource in this case, not return 0, especially as 0 can be a valid IRQ resource too...

Fixes aff008ad813c ("platform_get_irq: Revert to platform_get_resource if of_irq_get fails")

4.7 has been tagged now. Can I count on this patch getting to 4.8? Or at
least some feedback given? :-/

Quoted 26 lines

---
The patch is against the 'driver-core-linus' branch of Greg KH's 'driver-core.git' repo.

See also commit 3993546646ba ("of: irq: fix of_irq_get[_byname]() kernel-doc")

Changes in version 2:
- expanded the changelog.

 drivers/base/platform.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: driver-core/drivers/base/platform.c
===================================================================

drivers/base/platform.c +1 -1
@@ -97,7 +97,7 @@ int platform_get_irq(struct platform_dev
 		int ret;
 
 		ret = of_irq_get(dev->dev.of_node, num);
-		if (ret >= 0 || ret == -EPROBE_DEFER)
+		if (ret > 0 || ret == -EPROBE_DEFER)
 			return ret;
 	}
 

drivers/base/platform.c int platform_get_irq_byname(struct platf · line 181

Quoted 8 lines
drivers/base/platform.c +1 -1
@@ -175,7 +175,7 @@ int platform_get_irq_byname(struct platf
 		int ret;
 
 		ret = of_irq_get_byname(dev->dev.of_node, name);
-		if (ret >= 0 || ret == -EPROBE_DEFER)
+		if (ret > 0 || ret == -EPROBE_DEFER)
 			return ret;
 	}
 

MBR, Sergei

#2 lore raw
Quoted 10 lines · Sergei Shtylyov

Hello.

Quoted 6 lines · Sergei Shtylyov

of_irq_get[_byname]() return 0 iff irq_create_of_mapping() call fails. Returning both error code and 0 on failure is a sign of a misdesigned API, it makes the failure check unnecessarily complex and error prone. We should rely on the platform IRQ resource in this case, not return 0, especially as 0 can be a valid IRQ resource too...

Quoted 6 lines
Quoted 3 lines
Fixes aff008ad813c ("platform_get_irq: Revert to platform_get_resource if of_irq_get fails")

4.7 has been tagged now. Can I count on this patch getting to 4.8? Or at
least some feedback given? :-/

I'll get to it after 4.8-rc1 is out, but ideally one of the of developers would look at it, as I have no way to test this...

thanks,

greg k-h