arm: Fold irq_set_chip/irq_set_handler (f38c02f3) · Commits · 戴 / test

arch/arm/common/gic.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -319,8 +319,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic,
		* Setup the Linux IRQ subsystem.
		*/
		for (i = irq_start; i < irq_limit; i++) {
		irq_set_chip(i, &gic_chip);
		irq_set_handler(i, handle_level_irq);
		irq_set_chip_and_handler(i, &gic_chip, handle_level_irq);
		irq_set_chip_data(i, gic);
		set_irq_flags(i, IRQF_VALID \| IRQF_PROBE);
		}

+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++) {
		irq_set_chip(irq, &it8152_irq_chip);
		irq_set_handler(irq, handle_level_irq);
		irq_set_chip_and_handler(irq, &it8152_irq_chip,
		handle_level_irq);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		}
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -203,8 +203,7 @@ static void locomo_setup_irq(struct locomo *lchip)

		/* Install handlers for IRQ_LOCOMO_* */
		for ( ; irq <= lchip->irq_base + 3; irq++) {
		irq_set_chip(irq, &locomo_chip);
		irq_set_handler(irq, handle_level_irq);
		irq_set_chip_and_handler(irq, &locomo_chip, handle_level_irq);
		irq_set_chip_data(irq, lchip);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -472,15 +472,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
		sa1111_writel(~0, irqbase + SA1111_INTSTATCLR1);

		for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
		irq_set_chip(irq, &sa1111_low_chip);
		irq_set_handler(irq, handle_edge_irq);
		irq_set_chip_and_handler(irq, &sa1111_low_chip,
		handle_edge_irq);
		irq_set_chip_data(irq, sachip);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		}

		for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
		irq_set_chip(irq, &sa1111_high_chip);
		irq_set_handler(irq, handle_edge_irq);
		irq_set_chip_and_handler(irq, &sa1111_high_chip,
		handle_edge_irq);
		irq_set_chip_data(irq, sachip);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -305,8 +305,8 @@ static void __init vic_set_irq_sources(void __iomem *base,
		if (vic_sources & (1 << i)) {
		unsigned int irq = irq_start + i;

		irq_set_chip(irq, &vic_chip);
		irq_set_handler(irq, handle_level_irq);
		irq_set_chip_and_handler(irq, &vic_chip,
		handle_level_irq);
		irq_set_chip_data(irq, base);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		}