m68k: Convert irq function namespace (0b98b163) · Commits · 戴 / test

arch/m68k/kernel/irq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ int show_interrupts(struct seq_file p, void v)
		if (ap) {
		seq_printf(p, "%3d: ", irq);
		seq_printf(p, "%10u ", kstat_irqs(irq));
		seq_printf(p, "%14s ", get_irq_desc_chip(desc)->name);
		seq_printf(p, "%14s ", irq_desc_get_chip(desc)->name);

		seq_printf(p, "%s", ap->name);
		for (ap = ap->next; ap; ap = ap->next)

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ static int __init mcf_intc2_init(void)

		/* GPIO interrupt sources */
		for (irq = MCFINTC2_GPIOIRQ0; (irq <= MCFINTC2_GPIOIRQ7); irq++) {
		set_irq_chip(irq, &intc2_irq_gpio_chip);
		set_irq_handler(irq, handle_edge_irq);
		irq_set_chip(irq, &intc2_irq_gpio_chip);
		irq_set_handler(irq, handle_edge_irq);
		}

		return 0;

+6 −6

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)
		*/
		static void intc_external_irq(unsigned int irq, struct irq_desc *desc)
		{
		get_irq_desc_chip(desc)->irq_ack(&desc->irq_data);
		irq_desc_get_chip(desc)->irq_ack(&desc->irq_data);
		handle_simple_irq(irq, desc);
		}

		@@ -171,16 +171,16 @@ void __init init_IRQ(void)
		writel(0x88888888, MCF_MBAR + MCFSIM_ICR4);

		for (irq = 0; (irq < NR_IRQS); irq++) {
		set_irq_chip(irq, &intc_irq_chip);
		irq_set_chip(irq, &intc_irq_chip);
		edge = 0;
		if ((irq >= MCFINT_VECBASE) && (irq <= MCFINT_VECMAX))
		edge = intc_irqmap[irq - MCFINT_VECBASE].ack;
		if (edge) {
		set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
		set_irq_handler(irq, intc_external_irq);
		irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
		irq_set_handler(irq, intc_external_irq);
		} else {
		set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
		set_irq_handler(irq, handle_level_irq);
		irq_set_irq_type(irq, IRQ_TYPE_LEVEL_HIGH);
		irq_set_handler(irq, handle_level_irq);
		}
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -179,8 +179,8 @@ void __init init_IRQ(void)
		IMR = ~0;

		for (i = 0; (i < NR_IRQS); i++) {
		set_irq_chip(i, &intc_irq_chip);
		set_irq_handler(i, handle_level_irq);
		irq_set_chip(i, &intc_irq_chip);
		irq_set_handler(i, handle_level_irq);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,8 +132,8 @@ void init_IRQ(void)
		pquicc->intr_cimr = 0x00000000;

		for (i = 0; (i < NR_IRQS); i++) {
		set_irq_chip(i, &intc_irq_chip);
		set_irq_handler(i, handle_level_irq);
		irq_set_chip(i, &intc_irq_chip);
		irq_set_handler(i, handle_level_irq);
		}
		}