driver core: platform: Declare ret variable only once

We may define ret variable only once and avoid adding it each time
platform_get_irq_optional() get extended.

For the sake of consistency do the same in __platform_get_irq_byname().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20191023122505.64684-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d51dc35749c6983b08172e92f09b7113fdeaf37c..7c532548b0a62d8d0ac99d8d052de4a8d045ef18 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -143,9 +143,9 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
        return dev->archdata.irqs[num];
 #else
        struct resource *r;
-       if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) {
-               int ret;
+       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;
@@ -154,8 +154,6 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
        r = platform_get_resource(dev, IORESOURCE_IRQ, num);
        if (has_acpi_companion(&dev->dev)) {
                if (r && r->flags & IORESOURCE_DISABLED) {
-                       int ret;
-
                        ret = acpi_irq_get(ACPI_HANDLE(&dev->dev), num, r);
                        if (ret)
                                return ret;
@@ -188,8 +186,7 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num)
         * allows a common code path across either kind of resource.
         */
        if (num == 0 && has_acpi_companion(&dev->dev)) {
-               int ret = acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), 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;
@@ -277,10 +274,9 @@ static int __platform_get_irq_byname(struct platform_device *dev,
                                     const char *name)
 {
        struct resource *r;
+       int ret;
 
        if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) {
-               int ret;
-
                ret = of_irq_get_byname(dev->dev.of_node, name);
                if (ret > 0 || ret == -EPROBE_DEFER)
                        return ret;