1

pinctrl: aw9523: Use temporary variable for HW IRQ number

There are two different ways on how to get HW IRQ number in some functions.
Unify that by using temporary variable and irqd_to_hwirq() call.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Message-ID: <20240329105634.712457-6-andy.shevchenko@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2024-03-29 12:55:19 +02:00 committed by Linus Walleij
parent 418ee9488f
commit 66413f0468

View File

@ -428,12 +428,12 @@ static int aw9523_gpio_irq_type(struct irq_data *d, unsigned int type)
static void aw9523_irq_mask(struct irq_data *d) static void aw9523_irq_mask(struct irq_data *d)
{ {
struct aw9523 *awi = gpiochip_get_data(irq_data_get_irq_chip_data(d)); struct aw9523 *awi = gpiochip_get_data(irq_data_get_irq_chip_data(d));
unsigned int n = d->hwirq % AW9523_PINS_PER_PORT; irq_hw_number_t hwirq = irqd_to_hwirq(d);
unsigned int n = hwirq % AW9523_PINS_PER_PORT;
regmap_update_bits(awi->regmap, regmap_update_bits(awi->regmap, AW9523_REG_INTR_DIS(hwirq),
AW9523_REG_INTR_DIS(d->hwirq),
BIT(n), BIT(n)); BIT(n), BIT(n));
gpiochip_disable_irq(&awi->gpio, irqd_to_hwirq(d)); gpiochip_disable_irq(&awi->gpio, hwirq);
} }
/* /*
@ -446,11 +446,11 @@ static void aw9523_irq_mask(struct irq_data *d)
static void aw9523_irq_unmask(struct irq_data *d) static void aw9523_irq_unmask(struct irq_data *d)
{ {
struct aw9523 *awi = gpiochip_get_data(irq_data_get_irq_chip_data(d)); struct aw9523 *awi = gpiochip_get_data(irq_data_get_irq_chip_data(d));
unsigned int n = d->hwirq % AW9523_PINS_PER_PORT; irq_hw_number_t hwirq = irqd_to_hwirq(d);
unsigned int n = hwirq % AW9523_PINS_PER_PORT;
gpiochip_enable_irq(&awi->gpio, irqd_to_hwirq(d)); gpiochip_enable_irq(&awi->gpio, hwirq);
regmap_update_bits(awi->regmap, regmap_update_bits(awi->regmap, AW9523_REG_INTR_DIS(hwirq),
AW9523_REG_INTR_DIS(d->hwirq),
BIT(n), 0); BIT(n), 0);
} }