Commit 6845664a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

arm: Cleanup the irq namespace 



Convert to the new function names. Automated with coccinelle.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 25a5662a

arch/arm/common/gic.c

+7 −7
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ static int gic_set_wake(struct irq_data *d, unsigned int on) 


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

{

	struct gic_chip_data *chip_data = get_irq_data(irq);

	struct irq_chip *chip = get_irq_chip(irq);

	struct gic_chip_data *chip_data = irq_get_handler_data(irq);

	struct irq_chip *chip = irq_get_chip(irq);

	unsigned int cascade_irq, gic_irq;

	unsigned long status;
@@ -257,9 +257,9 @@ void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq) 
{

	if (gic_nr >= MAX_GIC_NR)

		BUG();

	if (set_irq_data(irq, &gic_data[gic_nr]) != 0)

	if (irq_set_handler_data(irq, &gic_data[gic_nr]) != 0)

		BUG();

	set_irq_chained_handler(irq, gic_handle_cascade_irq);

	irq_set_chained_handler(irq, gic_handle_cascade_irq);

}



static void __init gic_dist_init(struct gic_chip_data *gic,
@@ -319,9 +319,9 @@ static void __init gic_dist_init(struct gic_chip_data *gic, 
	 * Setup the Linux IRQ subsystem.

	 */

	for (i = irq_start; i < irq_limit; i++) {

		set_irq_chip(i, &gic_chip);

		set_irq_chip_data(i, gic);

		set_irq_handler(i, handle_level_irq);

		irq_set_chip(i, &gic_chip);

		irq_set_chip_data(i, gic);

		irq_set_handler(i, handle_level_irq);

		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);

	}

arch/arm/common/it8152.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ void it8152_init_irq(void) 
	__raw_writel((0), IT8152_INTC_LDCNIRR);



	for (irq = IT8152_IRQ(0); irq <= IT8152_LAST_IRQ; irq++) {

		set_irq_chip(irq, &it8152_irq_chip);

		set_irq_handler(irq, handle_level_irq);

		irq_set_chip(irq, &it8152_irq_chip);

		irq_set_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}

}

arch/arm/common/locomo.c

+9 −9
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static struct locomo_dev_info locomo_devices[] = { 


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

{

	struct locomo *lchip = get_irq_chip_data(irq);

	struct locomo *lchip = irq_get_chip_data(irq);

	int req, i;



	/* Acknowledge the parent IRQ */
@@ -197,15 +197,15 @@ static void locomo_setup_irq(struct locomo *lchip) 
	/*

	 * Install handler for IRQ_LOCOMO_HW.

	 */

	set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);

	set_irq_chip_data(lchip->irq, lchip);

	set_irq_chained_handler(lchip->irq, locomo_handler);

	irq_set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING);

	irq_set_chip_data(lchip->irq, lchip);

	irq_set_chained_handler(lchip->irq, locomo_handler);



	/* Install handlers for IRQ_LOCOMO_* */

	for ( ; irq <= lchip->irq_base + 3; irq++) {

		set_irq_chip(irq, &locomo_chip);

		set_irq_chip_data(irq, lchip);

		set_irq_handler(irq, handle_level_irq);

		irq_set_chip(irq, &locomo_chip);

		irq_set_chip_data(irq, lchip);

		irq_set_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}

}
@@ -476,8 +476,8 @@ static void __locomo_remove(struct locomo *lchip) 
	device_for_each_child(lchip->dev, NULL, locomo_remove_child);



	if (lchip->irq != NO_IRQ) {

		set_irq_chained_handler(lchip->irq, NULL);

		set_irq_data(lchip->irq, NULL);

		irq_set_chained_handler(lchip->irq, NULL);

		irq_set_handler_data(lchip->irq, NULL);

	}



	iounmap(lchip->base);

arch/arm/common/sa1111.c

+12 −12
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void 
sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)

{

	unsigned int stat0, stat1, i;

	struct sa1111 *sachip = get_irq_data(irq);

	struct sa1111 *sachip = irq_get_handler_data(irq);

	void __iomem *mapbase = sachip->base + SA1111_INTC;



	stat0 = sa1111_readl(mapbase + SA1111_INTSTATCLR0);
@@ -472,25 +472,25 @@ static void sa1111_setup_irq(struct sa1111 *sachip) 
	sa1111_writel(~0, irqbase + SA1111_INTSTATCLR1);



	for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {

		set_irq_chip(irq, &sa1111_low_chip);

		set_irq_chip_data(irq, sachip);

		set_irq_handler(irq, handle_edge_irq);

		irq_set_chip(irq, &sa1111_low_chip);

		irq_set_chip_data(irq, sachip);

		irq_set_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}



	for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {

		set_irq_chip(irq, &sa1111_high_chip);

		set_irq_chip_data(irq, sachip);

		set_irq_handler(irq, handle_edge_irq);

		irq_set_chip(irq, &sa1111_high_chip);

		irq_set_chip_data(irq, sachip);

		irq_set_handler(irq, handle_edge_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	}



	/*

	 * Register SA1111 interrupt

	 */

	set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);

	set_irq_data(sachip->irq, sachip);

	set_irq_chained_handler(sachip->irq, sa1111_irq_handler);

	irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);

	irq_set_handler_data(sachip->irq, sachip);

	irq_set_chained_handler(sachip->irq, sa1111_irq_handler);

}



/*
@@ -815,8 +815,8 @@ static void __sa1111_remove(struct sa1111 *sachip) 
	clk_disable(sachip->clk);



	if (sachip->irq != NO_IRQ) {

		set_irq_chained_handler(sachip->irq, NULL);

		set_irq_data(sachip->irq, NULL);

		irq_set_chained_handler(sachip->irq, NULL);

		irq_set_handler_data(sachip->irq, NULL);



		release_mem_region(sachip->phys + SA1111_INTC, 512);

	}

arch/arm/common/vic.c

+3 −3
Original line number Diff line number Diff line
@@ -305,9 +305,9 @@ static void __init vic_set_irq_sources(void __iomem *base, 
		if (vic_sources & (1 << i)) {

			unsigned int irq = irq_start + i;



			set_irq_chip(irq, &vic_chip);

			set_irq_chip_data(irq, base);

			set_irq_handler(irq, handle_level_irq);

			irq_set_chip(irq, &vic_chip);

			irq_set_chip_data(irq, base);

			irq_set_handler(irq, handle_level_irq);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		}

	}