renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

pinctrl: armada-37xx: Stop using struct gpio_chip.irq_base

Browse Source 
The Armada 37xx driver always initializes the IRQ base to 0, hence the
subtraction is a no-op. Remove the subtraction and thereby the last user
of struct gpio_chip's .irq_base field.

Note that this was also actually a bug and only worked because of the
above assumption. If the IRQ base had been dynamically allocated, the
subtraction would've caused the wrong mask to be generated since the
struct irq_data.hwirq field is an index local to the IRQ domain. As a
result, it should now be safe to also allocate this chip's IRQ base
dynamically, unless there are consumers left that refer to the IRQs by
their global number.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Thierry Reding 2017-10-16 14:40:23 +02:00 committed by Linus Walleij
parent 0747c3ecfb
commit 3ee9e605ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
View File

@ -627,14 +627,14 @@ static void armada_37xx_irq_handler(struct irq_desc *desc)
static unsigned int armada_37xx_irq_startup(struct irq_data *d) static unsigned int armada_37xx_irq_startup(struct irq_data *d)
{ {
struct gpio_chip *chip = irq_data_get_irq_chip_data(d); struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
int irq = d->hwirq - chip->irq_base;
/* /*
* The mask field is a "precomputed bitmask for accessing the * The mask field is a "precomputed bitmask for accessing the
* chip registers" which was introduced for the generic * chip registers" which was introduced for the generic
* irqchip framework. As we don't use this framework, we can * irqchip framework. As we don't use this framework, we can
* reuse this field for our own usage. * reuse this field for our own usage.
*/ */
d->mask = BIT(irq % GPIO_PER_REG); d->mask = BIT(d->hwirq % GPIO_PER_REG);
armada_37xx_irq_unmask(d); armada_37xx_irq_unmask(d);