From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: Marc Zyngier <maz@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH v5 6/6] gpiolib: Fold conditionals into a simple ternary operator
Date: Mon, 8 Mar 2021 21:45:35 +0200 [thread overview]
Message-ID: <20210308194535.66394-7-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210308194535.66394-1-andriy.shevchenko@linux.intel.com>
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(-)
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
next prev parent reply other threads:[~2021-03-08 19:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 19:45 [PATCH v5 0/6] gpiolib: switch to fwnode in the core Andy Shevchenko
2021-03-08 19:45 ` [PATCH v5 1/6] irqdomain: Introduce irq_domain_create_simple() API Andy Shevchenko
2021-03-09 16:34 ` Linus Walleij
2021-03-09 16:40 ` Andy Shevchenko
2021-03-08 19:45 ` [PATCH v5 2/6] gpiolib: Unify the checks on fwnode type Andy Shevchenko
2021-03-08 19:45 ` [PATCH v5 3/6] gpiolib: Move of_node operations to gpiolib-of and correct fwnode use Andy Shevchenko
2021-03-08 19:45 ` [PATCH v5 4/6] gpiolib: Introduce acpi_gpio_dev_init() and call it from core Andy Shevchenko
2021-03-08 19:45 ` [PATCH v5 5/6] gpiolib: Reuse device's fwnode to create IRQ domain Andy Shevchenko
2021-03-09 16:34 ` Linus Walleij
2021-03-08 19:45 ` Andy Shevchenko [this message]
2021-03-08 19:47 ` [PATCH v5 6/6] gpiolib: Fold conditionals into a simple ternary operator Rafael J. Wysocki
2021-03-08 20:04 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308194535.66394-7-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=corbet@lwn.net \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).