Commit d5bb1221 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Samuel Ortiz
Browse files

mfd: Cleanup irq namespace 



Converted with coccinelle.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c22435a3

drivers/mfd/88pm860x-core.c

+4 −4
Original line number Diff line number Diff line
@@ -470,14 +470,14 @@ static int __devinit device_irq_init(struct pm860x_chip *chip, 
	/* register IRQ by genirq */

	for (i = 0; i < ARRAY_SIZE(pm860x_irqs); i++) {

		__irq = i + chip->irq_base;

		set_irq_chip_data(__irq, chip);

		set_irq_chip_and_handler(__irq, &pm860x_irq_chip,

		irq_set_chip_data(__irq, chip);

		irq_set_chip_and_handler(__irq, &pm860x_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/mfd/ab3550-core.c

+6 −6
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int ab3550_startup_irq_enabled(struct device *dev, unsigned int irq) 
	struct ab3550_platform_data *plf_data;

	bool val;



	ab = get_irq_chip_data(irq);

	ab = irq_get_chip_data(irq);

	plf_data = ab->i2c_client[0]->dev.platform_data;

	irq -= plf_data->irq.base;

	val = ((ab->startup_events[irq / 8] & BIT(irq % 8)) != 0);
@@ -1296,14 +1296,14 @@ static int __init ab3550_probe(struct i2c_client *client, 
		unsigned int irq;



		irq = ab3550_plf_data->irq.base + i;

		set_irq_chip_data(irq, ab);

		set_irq_chip_and_handler(irq, &ab3550_irq_chip,

		irq_set_chip_data(irq, ab);

		irq_set_chip_and_handler(irq, &ab3550_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

	}

drivers/mfd/ab8500-core.c

+6 −6
Original line number Diff line number Diff line
@@ -334,14 +334,14 @@ static int ab8500_irq_init(struct ab8500 *ab8500) 
	int irq;



	for (irq = base; irq < base + AB8500_NR_IRQS; irq++) {

		set_irq_chip_data(irq, ab8500);

		set_irq_chip_and_handler(irq, &ab8500_irq_chip,

		irq_set_chip_data(irq, ab8500);

		irq_set_chip_and_handler(irq, &ab8500_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

	}
@@ -357,8 +357,8 @@ static void ab8500_irq_remove(struct ab8500 *ab8500) 
#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);

	}

}

drivers/mfd/asic3.c

+11 −11
Original line number Diff line number Diff line
@@ -388,21 +388,21 @@ static int __init asic3_irq_probe(struct platform_device *pdev) 


	for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) {

		if (irq < asic->irq_base + ASIC3_NUM_GPIOS)

			set_irq_chip(irq, &asic3_gpio_irq_chip);

			irq_set_chip(irq, &asic3_gpio_irq_chip);

		else

			set_irq_chip(irq, &asic3_irq_chip);

			irq_set_chip(irq, &asic3_irq_chip);



		set_irq_chip_data(irq, asic);

		set_irq_handler(irq, handle_level_irq);

		irq_set_chip_data(irq, asic);

		irq_set_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}



	asic3_write_register(asic, ASIC3_OFFSET(INTR, INT_MASK),

			     ASIC3_INTMASK_GINTMASK);



	set_irq_chained_handler(asic->irq_nr, asic3_irq_demux);

	set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);

	set_irq_data(asic->irq_nr, asic);

	irq_set_chained_handler(asic->irq_nr, asic3_irq_demux);

	irq_set_irq_type(asic->irq_nr, IRQ_TYPE_EDGE_RISING);

	irq_set_handler_data(asic->irq_nr, asic);



	return 0;

}
@@ -416,11 +416,11 @@ static void asic3_irq_remove(struct platform_device *pdev) 


	for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) {

		set_irq_flags(irq, 0);

		set_irq_handler(irq, NULL);

		set_irq_chip(irq, NULL);

		set_irq_chip_data(irq, NULL);

		irq_set_handler(irq, NULL);

		irq_set_chip(irq, NULL);

		irq_set_chip_data(irq, NULL);

	}

	set_irq_chained_handler(asic->irq_nr, NULL);

	irq_set_chained_handler(asic->irq_nr, NULL);

}



/* GPIOs */

drivers/mfd/ezx-pcap.c

+10 −10
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_struct *work) 


static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	struct pcap_chip *pcap = get_irq_data(irq);

	struct pcap_chip *pcap = irq_get_handler_data(irq);



	desc->irq_data.chip->irq_ack(&desc->irq_data);

	queue_work(pcap->workqueue, &pcap->isr_work);
@@ -411,7 +411,7 @@ static int __devexit ezx_pcap_remove(struct spi_device *spi) 


	/* cleanup irqchip */

	for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)

		set_irq_chip_and_handler(i, NULL, NULL);

		irq_set_chip_and_handler(i, NULL, NULL);



	destroy_workqueue(pcap->workqueue);
@@ -468,12 +468,12 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi) 


	/* setup irq chip */

	for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++) {

		set_irq_chip_and_handler(i, &pcap_irq_chip, handle_simple_irq);

		set_irq_chip_data(i, pcap);

		irq_set_chip_and_handler(i, &pcap_irq_chip, handle_simple_irq);

		irq_set_chip_data(i, pcap);

#ifdef CONFIG_ARM

		set_irq_flags(i, IRQF_VALID);

#else

		set_irq_noprobe(i);

		irq_set_noprobe(i);

#endif

	}
@@ -482,10 +482,10 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi) 
	ezx_pcap_write(pcap, PCAP_REG_ISR, PCAP_CLEAR_INTERRUPT_REGISTER);

	pcap->msr = PCAP_MASK_ALL_INTERRUPT;



	set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING);

	set_irq_data(spi->irq, pcap);

	set_irq_chained_handler(spi->irq, pcap_irq_handler);

	set_irq_wake(spi->irq, 1);

	irq_set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING);

	irq_set_handler_data(spi->irq, pcap);

	irq_set_chained_handler(spi->irq, pcap_irq_handler);

	irq_set_irq_wake(spi->irq, 1);



	/* ADC */

	adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?
@@ -514,7 +514,7 @@ static int __devinit ezx_pcap_probe(struct spi_device *spi) 
	free_irq(adc_irq, pcap);

free_irqchip:

	for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)

		set_irq_chip_and_handler(i, NULL, NULL);

		irq_set_chip_and_handler(i, NULL, NULL);

/* destroy_workqueue: */

	destroy_workqueue(pcap->workqueue);

free_pcap: