Skip to content

Commit 957e64b

Browse files
Linus WalleijBartosz Golaszewski
authored andcommitted
gpio: rda: Convert to immutable irq_chip
Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Manivannan Sadhasivam <mani@kernel.org> Reviewed-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
1 parent 9bc167e commit 957e64b

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

drivers/gpio/gpio-rda.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ struct rda_gpio {
3838
struct gpio_chip chip;
3939
void __iomem *base;
4040
spinlock_t lock;
41-
struct irq_chip irq_chip;
4241
int irq;
4342
};
4443

@@ -74,6 +73,7 @@ static void rda_gpio_irq_mask(struct irq_data *data)
7473
value |= BIT(offset) << RDA_GPIO_IRQ_FALL_SHIFT;
7574

7675
writel_relaxed(value, base + RDA_GPIO_INT_CTRL_CLR);
76+
gpiochip_disable_irq(chip, offset);
7777
}
7878

7979
static void rda_gpio_irq_ack(struct irq_data *data)
@@ -154,6 +154,7 @@ static void rda_gpio_irq_unmask(struct irq_data *data)
154154
u32 offset = irqd_to_hwirq(data);
155155
u32 trigger = irqd_get_trigger_type(data);
156156

157+
gpiochip_enable_irq(chip, offset);
157158
rda_gpio_set_irq(chip, offset, trigger);
158159
}
159160

@@ -195,6 +196,16 @@ static void rda_gpio_irq_handler(struct irq_desc *desc)
195196
chained_irq_exit(ic, desc);
196197
}
197198

199+
static const struct irq_chip rda_gpio_irq_chip = {
200+
.name = "rda-gpio",
201+
.irq_ack = rda_gpio_irq_ack,
202+
.irq_mask = rda_gpio_irq_mask,
203+
.irq_unmask = rda_gpio_irq_unmask,
204+
.irq_set_type = rda_gpio_irq_set_type,
205+
.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE,
206+
GPIOCHIP_IRQ_RESOURCE_HELPERS,
207+
};
208+
198209
static int rda_gpio_probe(struct platform_device *pdev)
199210
{
200211
struct device *dev = &pdev->dev;
@@ -241,15 +252,8 @@ static int rda_gpio_probe(struct platform_device *pdev)
241252
rda_gpio->chip.base = -1;
242253

243254
if (rda_gpio->irq >= 0) {
244-
rda_gpio->irq_chip.name = "rda-gpio",
245-
rda_gpio->irq_chip.irq_ack = rda_gpio_irq_ack,
246-
rda_gpio->irq_chip.irq_mask = rda_gpio_irq_mask,
247-
rda_gpio->irq_chip.irq_unmask = rda_gpio_irq_unmask,
248-
rda_gpio->irq_chip.irq_set_type = rda_gpio_irq_set_type,
249-
rda_gpio->irq_chip.flags = IRQCHIP_SKIP_SET_WAKE,
250-
251255
girq = &rda_gpio->chip.irq;
252-
girq->chip = &rda_gpio->irq_chip;
256+
gpio_irq_chip_set_chip(girq, &rda_gpio_irq_chip);
253257
girq->handler = handle_bad_irq;
254258
girq->default_type = IRQ_TYPE_NONE;
255259
girq->parent_handler = rda_gpio_irq_handler;

0 commit comments

Comments
 (0)