Commit c99f4ebc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

driver core: platform: Make clear error code used for missed IRQ

We have few code paths where same error code is assigned and
returned for missed IRQ. Unify that under single error path.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210331145937.35980-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc710790
...@@ -192,7 +192,7 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) ...@@ -192,7 +192,7 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
#ifdef CONFIG_SPARC #ifdef CONFIG_SPARC
/* sparc does not have irqs represented as IORESOURCE_IRQ resources */ /* sparc does not have irqs represented as IORESOURCE_IRQ resources */
if (!dev || num >= dev->archdata.num_irqs) if (!dev || num >= dev->archdata.num_irqs)
return -ENXIO; goto out_not_found;
ret = dev->archdata.irqs[num]; ret = dev->archdata.irqs[num];
goto out; goto out;
#else #else
...@@ -223,10 +223,8 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) ...@@ -223,10 +223,8 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
struct irq_data *irqd; struct irq_data *irqd;
irqd = irq_get_irq_data(r->start); irqd = irq_get_irq_data(r->start);
if (!irqd) { if (!irqd)
ret = -ENXIO; goto out_not_found;
goto out;
}
irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS); irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS);
} }
...@@ -249,8 +247,9 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) ...@@ -249,8 +247,9 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
goto out; goto out;
} }
ret = -ENXIO;
#endif #endif
out_not_found:
ret = -ENXIO;
out: out:
WARN(ret == 0, "0 is an invalid IRQ number\n"); WARN(ret == 0, "0 is an invalid IRQ number\n");
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment