Merge tag 'pci-v5.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[platform/kernel/linux-starfive.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 615c6b0..4b49641 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -153,23 +153,24 @@ EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource_byname);
  *             if (irq < 0)
  *                     return irq;
  *
- * Return: IRQ number on success, negative error number on failure.
+ * Return: non-zero IRQ number on success, negative error number on failure.
  */
 int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
 {
+       int ret;
 #ifdef CONFIG_SPARC
        /* sparc does not have irqs represented as IORESOURCE_IRQ resources */
        if (!dev || num >= dev->archdata.num_irqs)
                return -ENXIO;
-       return dev->archdata.irqs[num];
+       ret = dev->archdata.irqs[num];
+       goto out;
 #else
        struct resource *r;
-       int ret;
 
        if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) {
                ret = of_irq_get(dev->dev.of_node, num);
                if (ret > 0 || ret == -EPROBE_DEFER)
-                       return ret;
+                       goto out;
        }
 
        r = platform_get_resource(dev, IORESOURCE_IRQ, num);
@@ -177,7 +178,7 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
                if (r && r->flags & IORESOURCE_DISABLED) {
                        ret = acpi_irq_get(ACPI_HANDLE(&dev->dev), num, r);
                        if (ret)
-                               return ret;
+                               goto out;
                }
        }
 
@@ -191,13 +192,17 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
                struct irq_data *irqd;
 
                irqd = irq_get_irq_data(r->start);
-               if (!irqd)
-                       return -ENXIO;
+               if (!irqd) {
+                       ret = -ENXIO;
+                       goto out;
+               }
                irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS);
        }
 
-       if (r)
-               return r->start;
+       if (r) {
+               ret = r->start;
+               goto out;
+       }
 
        /*
         * For the index 0 interrupt, allow falling back to GpioInt
@@ -210,11 +215,14 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
                ret = acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num);
                /* Our callers expect -ENXIO for missing IRQs. */
                if (ret >= 0 || ret == -EPROBE_DEFER)
-                       return ret;
+                       goto out;
        }
 
-       return -ENXIO;
+       ret = -ENXIO;
 #endif
+out:
+       WARN(ret == 0, "0 is an invalid IRQ number\n");
+       return ret;
 }
 EXPORT_SYMBOL_GPL(platform_get_irq_optional);
 
@@ -233,7 +241,7 @@ EXPORT_SYMBOL_GPL(platform_get_irq_optional);
  *             if (irq < 0)
  *                     return irq;
  *
- * Return: IRQ number on success, negative error number on failure.
+ * Return: non-zero IRQ number on success, negative error number on failure.
  */
 int platform_get_irq(struct platform_device *dev, unsigned int num)
 {
@@ -305,8 +313,10 @@ static int __platform_get_irq_byname(struct platform_device *dev,
        }
 
        r = platform_get_resource_byname(dev, IORESOURCE_IRQ, name);
-       if (r)
+       if (r) {
+               WARN(r->start == 0, "0 is an invalid IRQ number\n");
                return r->start;
+       }
 
        return -ENXIO;
 }
@@ -318,7 +328,7 @@ static int __platform_get_irq_byname(struct platform_device *dev,
  *
  * Get an IRQ like platform_get_irq(), but then by name rather then by index.
  *
- * Return: IRQ number on success, negative error number on failure.
+ * Return: non-zero IRQ number on success, negative error number on failure.
  */
 int platform_get_irq_byname(struct platform_device *dev, const char *name)
 {
@@ -340,7 +350,7 @@ EXPORT_SYMBOL_GPL(platform_get_irq_byname);
  * Get an optional IRQ by name like platform_get_irq_byname(). Except that it
  * does not print an error message if an IRQ can not be obtained.
  *
- * Return: IRQ number on success, negative error number on failure.
+ * Return: non-zero IRQ number on success, negative error number on failure.
  */
 int platform_get_irq_byname_optional(struct platform_device *dev,
                                     const char *name)