Commit 266315fb authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski

gpiolib: Fold conditionals into a simple ternary operator

It's quite spread code to initialize IRQ domain options.
Let's fold it into a simple oneliner.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 5c63a9db
...@@ -1465,7 +1465,6 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, ...@@ -1465,7 +1465,6 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,
{ {
struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev); struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);
struct irq_chip *irqchip = gc->irq.chip; struct irq_chip *irqchip = gc->irq.chip;
const struct irq_domain_ops *ops = NULL;
unsigned int type; unsigned int type;
unsigned int i; unsigned int i;
...@@ -1503,15 +1502,11 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, ...@@ -1503,15 +1502,11 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,
return ret; return ret;
} else { } else {
/* Some drivers provide custom irqdomain ops */ /* 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->irq.domain = irq_domain_create_simple(fwnode,
gc->ngpio, gc->ngpio,
gc->irq.first, gc->irq.first,
ops, gc); gc->irq.domain_ops ?: &gpiochip_domain_ops,
gc);
if (!gc->irq.domain) if (!gc->irq.domain)
return -EINVAL; return -EINVAL;
} }
......
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