| Message ID | 20210309093736.67925-7-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 266315fb7cbed86f628f3fb4bb89a90943b66718 |
| Headers | show |
| Series | gpiolib: switch to fwnode in the core | expand |
On Tue, Mar 9, 2021 at 10:37 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > 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> > --- > drivers/gpio/gpiolib.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index afee48e7dd41..cee4333f8ac7 100644 > --- a/drivers/gpio/gpiolib.c > +++ b/drivers/gpio/gpiolib.c > @@ -1458,7 +1458,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; > > @@ -1496,15 +1495,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; > } > -- > 2.30.1 >
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index afee48e7dd41..cee4333f8ac7 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1458,7 +1458,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; @@ -1496,15 +1495,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; }
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> --- drivers/gpio/gpiolib.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)