Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51804bc authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

gpio: Cleanup genirq namespace 



Converted with coccinelle.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
LKML-Reference: <20110324212509.025730689@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 778b548c

drivers/gpio/adp5588-gpio.c

+4 −4
Original line number Diff line number Diff line
@@ -289,10 +289,10 @@ static int adp5588_irq_setup(struct adp5588_gpio *dev) 


	for (gpio = 0; gpio < dev->gpio_chip.ngpio; gpio++) {

		int irq = gpio + dev->irq_base;

		set_irq_chip_data(irq, dev);

		set_irq_chip_and_handler(irq, &adp5588_irq_chip,

		irq_set_chip_data(irq, dev);

		irq_set_chip_and_handler(irq, &adp5588_irq_chip,

					 handle_level_irq);

		set_irq_nested_thread(irq, 1);

		irq_set_nested_thread(irq, 1);

#ifdef CONFIG_ARM

		/*

		 * ARM needs us to explicitly flag the IRQ as VALID,
@@ -300,7 +300,7 @@ static int adp5588_irq_setup(struct adp5588_gpio *dev) 
		 */

		set_irq_flags(irq, IRQF_VALID);

#else

		set_irq_noprobe(irq);

		irq_set_noprobe(irq);

#endif

	}

drivers/gpio/max732x.c

+4 −4
Original line number Diff line number Diff line
@@ -470,14 +470,14 @@ static int max732x_irq_setup(struct max732x_chip *chip, 
			if (!(chip->dir_input & (1 << lvl)))

				continue;



			set_irq_chip_data(irq, chip);

			set_irq_chip_and_handler(irq, &max732x_irq_chip,

			irq_set_chip_data(irq, chip);

			irq_set_chip_and_handler(irq, &max732x_irq_chip,

						 handle_edge_irq);

			set_irq_nested_thread(irq, 1);

			irq_set_nested_thread(irq, 1);

#ifdef CONFIG_ARM

			set_irq_flags(irq, IRQF_VALID);

#else

			set_irq_noprobe(irq);

			irq_set_noprobe(irq);

#endif

		}

drivers/gpio/pca953x.c

+3 −3
Original line number Diff line number Diff line
@@ -395,13 +395,13 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, 
		for (lvl = 0; lvl < chip->gpio_chip.ngpio; lvl++) {

			int irq = lvl + chip->irq_base;



			set_irq_chip_data(irq, chip);

			set_irq_chip_and_handler(irq, &pca953x_irq_chip,

			irq_set_chip_data(irq, chip);

			irq_set_chip_and_handler(irq, &pca953x_irq_chip,

						 handle_edge_irq);

#ifdef CONFIG_ARM

			set_irq_flags(irq, IRQF_VALID);

#else

			set_irq_noprobe(irq);

			irq_set_noprobe(irq);

#endif

		}

drivers/gpio/pl061.c

+7 −7
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static struct irq_chip pl061_irqchip = { 


static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)

{

	struct list_head *chip_list = get_irq_data(irq);

	struct list_head *chip_list = irq_get_handler_data(irq);

	struct list_head *ptr;

	struct pl061_gpio *chip;
@@ -294,7 +294,7 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) 
		ret = -ENODEV;

		goto iounmap;

	}

	set_irq_chained_handler(irq, pl061_irq_handler);

	irq_set_chained_handler(irq, pl061_irq_handler);

	if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */

		chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL);

		if (chip_list == NULL) {
@@ -303,9 +303,9 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) 
			goto iounmap;

		}

		INIT_LIST_HEAD(chip_list);

		set_irq_data(irq, chip_list);

		irq_set_handler_data(irq, chip_list);

	} else

		chip_list = get_irq_data(irq);

		chip_list = irq_get_handler_data(irq);

	list_add(&chip->list, chip_list);



	for (i = 0; i < PL061_GPIO_NR; i++) {
@@ -315,10 +315,10 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) 
		else

			pl061_direction_input(&chip->gc, i);



		set_irq_chip(i+chip->irq_base, &pl061_irqchip);

		set_irq_handler(i+chip->irq_base, handle_simple_irq);

		irq_set_chip(i + chip->irq_base, &pl061_irqchip);

		irq_set_handler(i + chip->irq_base, handle_simple_irq);

		set_irq_flags(i+chip->irq_base, IRQF_VALID);

		set_irq_chip_data(i+chip->irq_base, chip);

		irq_set_chip_data(i + chip->irq_base, chip);

	}



	return 0;

drivers/gpio/stmpe-gpio.c

+6 −6
Original line number Diff line number Diff line
@@ -254,14 +254,14 @@ static int __devinit stmpe_gpio_irq_init(struct stmpe_gpio *stmpe_gpio) 
	int irq;



	for (irq = base; irq < base + stmpe_gpio->chip.ngpio; irq++) {

		set_irq_chip_data(irq, stmpe_gpio);

		set_irq_chip_and_handler(irq, &stmpe_gpio_irq_chip,

		irq_set_chip_data(irq, stmpe_gpio);

		irq_set_chip_and_handler(irq, &stmpe_gpio_irq_chip,

					 handle_simple_irq);

		set_irq_nested_thread(irq, 1);

		irq_set_nested_thread(irq, 1);

#ifdef CONFIG_ARM

		set_irq_flags(irq, IRQF_VALID);

#else

		set_irq_noprobe(irq);

		irq_set_noprobe(irq);

#endif

	}
@@ -277,8 +277,8 @@ static void stmpe_gpio_irq_remove(struct stmpe_gpio *stmpe_gpio) 
#ifdef CONFIG_ARM

		set_irq_flags(irq, 0);

#endif

		set_irq_chip_and_handler(irq, NULL, NULL);

		set_irq_chip_data(irq, NULL);

		irq_set_chip_and_handler(irq, NULL, NULL);

		irq_set_chip_data(irq, NULL);

	}

}