| Message ID | 20210308194535.66394-7-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | gpiolib: switch to fwnode in the core | expand |
On Mon, Mar 8, 2021 at 8:45 PM 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> Please see the comments I've just sent: https://lore.kernel.org/linux-acpi/CAJZ5v0gpNzyBDKfBXoBYskUXs15GrZAe-E2vzhSEu2Nrj7wa7g@mail.gmail.com/T/#u > --- > drivers/gpio/gpiolib.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index afee48e7dd41..8c5ce377accc 100644 > --- a/drivers/gpio/gpiolib.c > +++ b/drivers/gpio/gpiolib.c > @@ -1458,7 +1458,7 @@ 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; > + const struct irq_domain_ops *ops; > unsigned int type; > unsigned int i; > > @@ -1496,11 +1496,7 @@ 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; > + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; > gc->irq.domain = irq_domain_create_simple(fwnode, > gc->ngpio, > gc->irq.first, > -- > 2.30.1 >
On Mon, Mar 08, 2021 at 08:47:47PM +0100, Rafael J. Wysocki wrote: > On Mon, Mar 8, 2021 at 8:45 PM 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> > > Please see the comments I've just sent: > > https://lore.kernel.org/linux-acpi/CAJZ5v0gpNzyBDKfBXoBYskUXs15GrZAe-E2vzhSEu2Nrj7wa7g@mail.gmail.com/T/#u Yeah, I answered there, thanks!
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index afee48e7dd41..8c5ce377accc 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1458,7 +1458,7 @@ 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; + const struct irq_domain_ops *ops; unsigned int type; unsigned int i; @@ -1496,11 +1496,7 @@ 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; + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; gc->irq.domain = irq_domain_create_simple(fwnode, gc->ngpio, gc->irq.first,
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 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)