Skip to contentSkip to conversation

slimbus: qcom: Fix IRQ check in qcom_slim_probe

PATCH Superseded Miaoqian Lin 3 participants 4 messages Jan 14, 2022 – Apr 12, 2022

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

PATCH 1/1 slimbus: qcom: Fix IRQ check in qcom_slim_probe

platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:

    int irq = platform_get_irq(pdev, 0);
    if (irq < 0)
        return irq;

Fix the check of return value to catch errors correctly.

Fixes ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")
---
 drivers/slimbus/qcom-ctrl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/qcom-ctrl.c +2 -2
index f04b961b96cd..ec58091fc948 100644
@@ -510,9 +510,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
 	}
 
 	ctrl->irq = platform_get_irq(pdev, 0);
-	if (!ctrl->irq) {
+	if (ctrl->irq < 0) {
 		dev_err(&pdev->dev, "no slimbus IRQ\n");
-		return -ENODEV;
+		return ctrl->irq;
 	}
 
 	sctrl = &ctrl->ctrl;
Signature · 1 line
2.17.1
#1 lore raw
Quoted 1 line · Miaoqian Lin

platform_get_irq() returns negative error number instead 0 on failure.

the 'instead of' wording is a bit misleading:

platform_get_irq() returns non-zero IRQ number on success, negative error number on failure. Zero is not a valid return valid.

Quoted 31 lines

And the doc of platform_get_irq() provides a usage example:

    int irq = platform_get_irq(pdev, 0);
    if (irq < 0)
        return irq;

Fix the check of return value to catch errors correctly.

Fixes ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")
---
 drivers/slimbus/qcom-ctrl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/qcom-ctrl.c +2 -2
index f04b961b96cd..ec58091fc948 100644
@@ -510,9 +510,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
 	}
 
 	ctrl->irq = platform_get_irq(pdev, 0);
-	if (!ctrl->irq) {
+	if (ctrl->irq < 0) {
 		dev_err(&pdev->dev, "no slimbus IRQ\n");
-		return -ENODEV;
+		return ctrl->irq;
 	}
 
 	sctrl = &ctrl->ctrl;
#2 lore raw

PATCH v2 1/1 slimbus: qcom: Fix IRQ check in qcom_slim_probe

platform_get_irq() returns non-zero IRQ number on success, negative error number on failure.
And the doc of platform_get_irq() provides a usage example:

    int irq = platform_get_irq(pdev, 0);
    if (irq < 0)
        return irq;

Fix the check of return value to catch errors correctly.

Fixes ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")

---
changes in v2:
- use more precise expression in commit message.

---
 drivers/slimbus/qcom-ctrl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/qcom-ctrl.c +2 -2
index f04b961b96cd..ec58091fc948 100644
@@ -510,9 +510,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
 	}
 
 	ctrl->irq = platform_get_irq(pdev, 0);
-	if (!ctrl->irq) {
+	if (ctrl->irq < 0) {
 		dev_err(&pdev->dev, "no slimbus IRQ\n");
-		return -ENODEV;
+		return ctrl->irq;
 	}
 
 	sctrl = &ctrl->ctrl;
Signature · 1 line
2.17.1
#3 lore raw
Quoted 4 lines · Miaoqian Lin

platform_get_irq() returns non-zero IRQ number on success, negative error number on failure.
And the doc of platform_get_irq() provides a usage example:

Quoted 8 lines
     int irq = platform_get_irq(pdev, 0);
     if (irq < 0)
         return irq;

Fix the check of return value to catch errors correctly.

Fixes ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")

Applied thanks,

--srini

Quoted 23 lines

---
changes in v2:
- use more precise expression in commit message.

---
  drivers/slimbus/qcom-ctrl.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/qcom-ctrl.c +2 -2
index f04b961b96cd..ec58091fc948 100644
@@ -510,9 +510,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
  	}
 
  	ctrl->irq = platform_get_irq(pdev, 0);
-	if (!ctrl->irq) {
+	if (ctrl->irq < 0) {
  		dev_err(&pdev->dev, "no slimbus IRQ\n");
-		return -ENODEV;
+		return ctrl->irq;
  	}
 
  	sctrl = &ctrl->ctrl;