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

Commit a460e745 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] genirq: clean up irq-flow-type naming 



Introduce desc->name and eliminate the handle_irq_name() hack.  Add
set_irq_chip_and_handler_name() to set the flow type and name at once.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Matthew Wilcox <willy@debian.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 308ba5fc

arch/i386/kernel/i8259.c

+4 −3
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ void make_8259A_irq(unsigned int irq) 
{

	disable_irq_nosync(irq);

	io_apic_irqs &= ~(1<<irq);

	set_irq_chip_and_handler(irq, &i8259A_chip, handle_level_irq);

	set_irq_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,

				      "XT");

	enable_irq(irq);

}
@@ -369,8 +370,8 @@ void __init init_ISA_irqs (void) 
			/*

			 * 16 old-style INTA-cycle interrupts:

			 */

			set_irq_chip_and_handler(i, &i8259A_chip,

						 handle_level_irq);

			set_irq_chip_and_handler_name(i, &i8259A_chip,

						      handle_level_irq, "XT");

		} else {

			/*

			 * 'high' PCI IRQs filled in on demand

arch/i386/kernel/io_apic.c

+10 −7
Original line number Diff line number Diff line
@@ -1225,11 +1225,11 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger) 
{

	if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||

			trigger == IOAPIC_LEVEL)

		set_irq_chip_and_handler(irq, &ioapic_chip,

					 handle_fasteoi_irq);

		set_irq_chip_and_handler_name(irq, &ioapic_chip,

					 handle_fasteoi_irq, "fasteoi");

	else

		set_irq_chip_and_handler(irq, &ioapic_chip,

					 handle_edge_irq);

		set_irq_chip_and_handler_name(irq, &ioapic_chip,

					 handle_edge_irq, "edge");

	set_intr_gate(vector, interrupt[irq]);

}
@@ -2235,7 +2235,8 @@ static inline void check_timer(void) 
	printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");



	disable_8259A_irq(0);

	set_irq_chip_and_handler(0, &lapic_chip, handle_fasteoi_irq);

	set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq,

				      "fasteio");

	apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector);	/* Fixed mode */

	enable_8259A_irq(0);
@@ -2541,7 +2542,8 @@ int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev) 


	write_msi_msg(irq, &msg);



	set_irq_chip_and_handler(irq, &msi_chip, handle_edge_irq);

	set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq,

				      "edge");



	return 0;

}
@@ -2636,7 +2638,8 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) 
		write_ht_irq_low(irq, low);

		write_ht_irq_high(irq, high);



		set_irq_chip_and_handler(irq, &ht_irq_chip, handle_edge_irq);

		set_irq_chip_and_handler_name(irq, &ht_irq_chip,

					      handle_edge_irq, "edge");

	}

	return vector;

}

arch/i386/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int show_interrupts(struct seq_file *p, void *v) 
			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);

#endif

		seq_printf(p, " %8s", irq_desc[i].chip->name);

		seq_printf(p, "-%s", handle_irq_name(irq_desc[i].handle_irq));

		seq_printf(p, "-%-8s", irq_desc[i].name);

		seq_printf(p, "  %s", action->name);



		for (action=action->next; action; action = action->next)

arch/x86_64/kernel/i8259.c

+4 −3
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ void make_8259A_irq(unsigned int irq) 
{

	disable_irq_nosync(irq);

	io_apic_irqs &= ~(1<<irq);

	set_irq_chip_and_handler(irq, &i8259A_chip, handle_level_irq);

	set_irq_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,

				      "XT");

	enable_irq(irq);

}
@@ -431,8 +432,8 @@ void __init init_ISA_irqs (void) 
			/*

			 * 16 old-style INTA-cycle interrupts:

			 */

			set_irq_chip_and_handler(i, &i8259A_chip,

						 handle_level_irq);

			set_irq_chip_and_handler_name(i, &i8259A_chip,

						      handle_level_irq, "XT");

		} else {

			/*

			 * 'high' PCI IRQs filled in on demand

arch/x86_64/kernel/io_apic.c

+8 −7
Original line number Diff line number Diff line
@@ -696,11 +696,11 @@ static void ioapic_register_intr(int irq, int vector, unsigned long trigger) 
{

	if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||

			trigger == IOAPIC_LEVEL)

		set_irq_chip_and_handler(irq, &ioapic_chip,

					 handle_fasteoi_irq);

		set_irq_chip_and_handler_name(irq, &ioapic_chip,

					      handle_fasteoi_irq, "fasteoi");

	else

		set_irq_chip_and_handler(irq, &ioapic_chip,

					 handle_edge_irq);

		set_irq_chip_and_handler_name(irq, &ioapic_chip,

					      handle_edge_irq, "edge");

}



static void __init setup_IO_APIC_irqs(void)
@@ -806,7 +806,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in 
	 * The timer IRQ doesn't have to know that behind the

	 * scene we have a 8259A-master in AEOI mode ...

	 */

	set_irq_chip_and_handler(0, &ioapic_chip, handle_edge_irq);

	set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge");



	/*

	 * Add it to the IO-APIC irq-routing table:
@@ -1839,7 +1839,7 @@ int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev) 


	write_msi_msg(irq, &msg);



	set_irq_chip_and_handler(irq, &msi_chip, handle_edge_irq);

	set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge");



	return 0;

}
@@ -1936,7 +1936,8 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) 
		write_ht_irq_low(irq, low);

		write_ht_irq_high(irq, high);



		set_irq_chip_and_handler(irq, &ht_irq_chip, handle_edge_irq);

		set_irq_chip_and_handler_name(irq, &ht_irq_chip,

					      handle_edge_irq, "edge");

	}

	return vector;

}