gpiolib: Fold conditionals into a simple ternary operator
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 9 Mar 2021 09:37:36 +0000 (11:37 +0200)
committerBartosz Golaszewski <bgolaszewski@baylibre.com>
Fri, 26 Mar 2021 13:56:19 +0000 (14:56 +0100)
It's quite spread code to initialize IRQ domain options.
Let's fold it into a simple oneliner.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
drivers/gpio/gpiolib.c

index 00b097e..1427c1b 100644 (file)
@@ -1465,7 +1465,6 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,
 {
        struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);
        struct irq_chip *irqchip = gc->irq.chip;
-       const struct irq_domain_ops *ops = NULL;
        unsigned int type;
        unsigned int i;
 
@@ -1503,15 +1502,11 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,
                        return ret;
        } else {
                /* Some drivers provide custom irqdomain ops */
-               if (gc->irq.domain_ops)
-                       ops = gc->irq.domain_ops;
-
-               if (!ops)
-                       ops = &gpiochip_domain_ops;
                gc->irq.domain = irq_domain_create_simple(fwnode,
                        gc->ngpio,
                        gc->irq.first,
-                       ops, gc);
+                       gc->irq.domain_ops ?: &gpiochip_domain_ops,
+                       gc);
                if (!gc->irq.domain)
                        return -EINVAL;
        }