From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-gpio@vger.kernel.org, Serge Semin <fancer.lancer@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 05/13] gpio: dwapb: Convert to use irqd_to_hwirq()
Date: Thu, 9 Apr 2020 17:12:20 +0300 [thread overview]
Message-ID: <20200409141228.49561-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200409141228.49561-1-andriy.shevchenko@linux.intel.com>
Convert to use irqd_to_hwirq() instead of direct access to the hwirq member.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/gpio/gpio-dwapb.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index c0c267cddd80..3a1f3fae923f 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -230,7 +230,7 @@ static void dwapb_irq_enable(struct irq_data *d)
spin_lock_irqsave(&gc->bgpio_lock, flags);
val = dwapb_read(gpio, GPIO_INTEN);
- val |= BIT(d->hwirq);
+ val |= BIT(irqd_to_hwirq(d));
dwapb_write(gpio, GPIO_INTEN, val);
spin_unlock_irqrestore(&gc->bgpio_lock, flags);
}
@@ -245,7 +245,7 @@ static void dwapb_irq_disable(struct irq_data *d)
spin_lock_irqsave(&gc->bgpio_lock, flags);
val = dwapb_read(gpio, GPIO_INTEN);
- val &= ~BIT(d->hwirq);
+ val &= ~BIT(irqd_to_hwirq(d));
dwapb_write(gpio, GPIO_INTEN, val);
spin_unlock_irqrestore(&gc->bgpio_lock, flags);
}
@@ -255,8 +255,8 @@ static int dwapb_irq_set_type(struct irq_data *d, u32 type)
struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
struct dwapb_gpio *gpio = igc->private;
struct gpio_chip *gc = &gpio->ports[0].gc;
- int bit = d->hwirq;
unsigned long level, polarity, flags;
+ u32 bit = irqd_to_hwirq(d);
if (type & ~(IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
@@ -305,11 +305,12 @@ static int dwapb_irq_set_wake(struct irq_data *d, unsigned int enable)
struct irq_chip_generic *igc = irq_data_get_irq_chip_data(d);
struct dwapb_gpio *gpio = igc->private;
struct dwapb_context *ctx = gpio->ports[0].ctx;
+ u32 bit = irqd_to_hwirq(d);
if (enable)
- ctx->wake_en |= BIT(d->hwirq);
+ ctx->wake_en |= BIT(bit);
else
- ctx->wake_en &= ~BIT(d->hwirq);
+ ctx->wake_en &= ~BIT(bit);
return 0;
}
@@ -365,8 +366,9 @@ static void dwapb_configure_irqs(struct dwapb_gpio *gpio,
struct gpio_chip *gc = &port->gc;
struct fwnode_handle *fwnode = pp->fwnode;
struct irq_chip_generic *irq_gc = NULL;
- unsigned int hwirq, ngpio = gc->ngpio;
+ unsigned int ngpio = gc->ngpio;
struct irq_chip_type *ct;
+ irq_hw_number_t hwirq;
int err, i;
gpio->domain = irq_domain_create_linear(fwnode, ngpio,
--
2.25.1
next prev parent reply other threads:[~2020-04-09 14:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 14:12 [PATCH v1 00/13] gpio: dwapb: Clean up the driver and a fix Andy Shevchenko
2020-04-09 14:12 ` [PATCH v1 01/13] gpio: dwapb: Append MODULE_ALIAS for platform driver Andy Shevchenko
2020-04-15 11:58 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 02/13] gpio: dwapb: Refactor IRQ handler Andy Shevchenko
2020-04-15 12:04 ` Serge Semin
2020-04-15 12:35 ` Andy Shevchenko
2020-04-09 14:12 ` [PATCH v1 03/13] gpio: dwapb: set default handler to be handle_bad_irq() Andy Shevchenko
2020-04-15 12:22 ` Serge Semin
2020-04-15 12:33 ` Andy Shevchenko
2020-04-09 14:12 ` [PATCH v1 04/13] gpio: dwapb: Deduplicate IRQ resource management Andy Shevchenko
2020-04-15 12:28 ` Serge Semin
2020-04-09 14:12 ` Andy Shevchenko [this message]
2020-04-15 12:42 ` [PATCH v1 05/13] gpio: dwapb: Convert to use irqd_to_hwirq() Serge Semin
2020-04-15 13:16 ` Andy Shevchenko
2020-04-09 14:12 ` [PATCH v1 06/13] gpio: dwapb: Use device_get_match_data() to simplify code Andy Shevchenko
2020-04-15 12:46 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 07/13] gpio: dwapb: Convert to use IRQ core provided macros Andy Shevchenko
2020-04-15 12:57 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 08/13] gpio: dwapb: Switch to more usual pattern of RMW in dwapb_gpio_set_debounce() Andy Shevchenko
2020-04-15 13:00 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 09/13] gpio: dwapb: Drop bogus BUG_ON()s Andy Shevchenko
2020-04-15 13:05 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 10/13] gpio: dwapb: Drop of_match_ptr() & ACPI_PTR() calls Andy Shevchenko
2020-04-15 13:07 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 11/13] gpio: dwapb: Split out dwapb_get_irq() helper Andy Shevchenko
2020-04-15 13:13 ` Serge Semin
2020-04-09 14:12 ` [PATCH v1 12/13] gpio: dwapb: Use positive conditional in dwapb_configure_irqs() Andy Shevchenko
2020-04-09 14:12 ` [PATCH v1 13/13] gpio: dwapb: Amend indentation in some cases Andy Shevchenko
2020-04-09 14:28 ` [PATCH v1 00/13] gpio: dwapb: Clean up the driver and a fix Serge Semin
2020-04-15 11:55 ` Serge Semin
2020-04-15 12:06 ` 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=20200409141228.49561-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=fancer.lancer@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
/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).