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

gpio: tqmx86: 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: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent ef902f54

drivers/gpio/gpio-tqmx86.c

+20 −8
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#define TQMX86_NGPIO	8
@@ -34,7 +35,6 @@ 


struct tqmx86_gpio_data {

	struct gpio_chip	chip;

	struct irq_chip		irq_chip;

	void __iomem		*io_base;

	int			irq;

	raw_spinlock_t		spinlock;
@@ -122,6 +122,7 @@ static void tqmx86_gpio_irq_mask(struct irq_data *data) 
	gpiic &= ~mask;

	tqmx86_gpio_write(gpio, gpiic, TQMX86_GPIIC);

	raw_spin_unlock_irqrestore(&gpio->spinlock, flags);

	gpiochip_disable_irq(&gpio->chip, irqd_to_hwirq(data));

}



static void tqmx86_gpio_irq_unmask(struct irq_data *data)
@@ -134,6 +135,7 @@ static void tqmx86_gpio_irq_unmask(struct irq_data *data) 


	mask = TQMX86_GPII_MASK << (offset * TQMX86_GPII_BITS);



	gpiochip_enable_irq(&gpio->chip, irqd_to_hwirq(data));

	raw_spin_lock_irqsave(&gpio->spinlock, flags);

	gpiic = tqmx86_gpio_read(gpio, TQMX86_GPIIC);

	gpiic &= ~mask;
@@ -226,6 +228,22 @@ static void tqmx86_init_irq_valid_mask(struct gpio_chip *chip, 
	clear_bit(3, valid_mask);

}



static void tqmx86_gpio_irq_print_chip(struct irq_data *d, struct seq_file *p)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);



	seq_printf(p, gc->label);

}



static const struct irq_chip tqmx86_gpio_irq_chip = {

	.irq_mask = tqmx86_gpio_irq_mask,

	.irq_unmask = tqmx86_gpio_irq_unmask,

	.irq_set_type = tqmx86_gpio_irq_set_type,

	.irq_print_chip = tqmx86_gpio_irq_print_chip,

	.flags = IRQCHIP_IMMUTABLE,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};



static int tqmx86_gpio_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -277,14 +295,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) 
	pm_runtime_enable(&pdev->dev);



	if (irq > 0) {

		struct irq_chip *irq_chip = &gpio->irq_chip;

		u8 irq_status;



		irq_chip->name = chip->label;

		irq_chip->irq_mask = tqmx86_gpio_irq_mask;

		irq_chip->irq_unmask = tqmx86_gpio_irq_unmask;

		irq_chip->irq_set_type = tqmx86_gpio_irq_set_type;



		/* Mask all interrupts */

		tqmx86_gpio_write(gpio, 0, TQMX86_GPIIC);
@@ -293,7 +305,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) 
		tqmx86_gpio_write(gpio, irq_status, TQMX86_GPIIS);



		girq = &chip->irq;

		girq->chip = irq_chip;

		gpio_irq_chip_set_chip(girq, &tqmx86_gpio_irq_chip);

		girq->parent_handler = tqmx86_gpio_irq_handler;

		girq->num_parents = 1;

		girq->parents = devm_kcalloc(&pdev->dev, 1,