Commit d4c0cf34 authored by Linus Walleij's avatar Linus Walleij Committed by Bartosz Golaszewski
Browse files

gpio: adnp: Convert to immutable irq_chip 



Convert the driver to immutable irq-chip with a bit of
intuition.

Cc: Marc Zyngier <maz@kernel.org>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 5cd79816

drivers/gpio/gpio-adnp.c

+7 −2
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ static void adnp_irq_mask(struct irq_data *d) 
	unsigned int pos = d->hwirq & 7;



	adnp->irq_enable[reg] &= ~BIT(pos);

	gpiochip_disable_irq(gc, irqd_to_hwirq(d));

}



static void adnp_irq_unmask(struct irq_data *d)
@@ -316,6 +317,7 @@ static void adnp_irq_unmask(struct irq_data *d) 
	unsigned int reg = d->hwirq >> adnp->reg_shift;

	unsigned int pos = d->hwirq & 7;



	gpiochip_enable_irq(gc, irqd_to_hwirq(d));

	adnp->irq_enable[reg] |= BIT(pos);

}
@@ -372,13 +374,15 @@ static void adnp_irq_bus_unlock(struct irq_data *d) 
	mutex_unlock(&adnp->irq_lock);

}



static struct irq_chip adnp_irq_chip = {

static const struct irq_chip adnp_irq_chip = {

	.name = "gpio-adnp",

	.irq_mask = adnp_irq_mask,

	.irq_unmask = adnp_irq_unmask,

	.irq_set_type = adnp_irq_set_type,

	.irq_bus_lock = adnp_irq_bus_lock,

	.irq_bus_sync_unlock = adnp_irq_bus_unlock,

	.flags = IRQCHIP_IMMUTABLE,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};



static int adnp_irq_setup(struct adnp *adnp)
@@ -469,7 +473,8 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios, 
			return err;



		girq = &chip->irq;

		girq->chip = &adnp_irq_chip;

		gpio_irq_chip_set_chip(girq, &adnp_irq_chip);



		/* This will let us handle the parent IRQ in the driver */

		girq->parent_handler = NULL;

		girq->num_parents = 0;