lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Ingo Molnar <mingo@elte.hu>
Acked-by: Thomas 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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ingo Molnar
2006-10-17 00:10:03 -07:00
committed by Linus Torvalds
parent 308ba5fcf8
commit a460e745e8
8 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
kernel/irq/chip.c
View File

@ -499,7 +499,8 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
#endif /* CONFIG_SMP */
void
__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained)
__set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
const char *name)
{
struct irq_desc *desc;
unsigned long flags;
@ -540,6 +541,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained)
desc->depth = 1;
}
desc->handle_irq = handle;
desc->name = name;
if (handle != handle_bad_irq && is_chained) {
desc->status &= ~IRQ_DISABLED;
@ -555,30 +557,13 @@ set_irq_chip_and_handler(unsigned int irq, struct irq_chip *chip,
irq_flow_handler_t handle)
{
set_irq_chip(irq, chip);
__set_irq_handler(irq, handle, 0);
__set_irq_handler(irq, handle, 0, NULL);
}
/*
* Get a descriptive string for the highlevel handler, for
* /proc/interrupts output:
*/
const char *
handle_irq_name(irq_flow_handler_t handle)
void
set_irq_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
irq_flow_handler_t handle, const char *name)
{
if (handle == handle_level_irq)
return "level ";
if (handle == handle_fasteoi_irq)
return "fasteoi";
if (handle == handle_edge_irq)
return "edge ";
if (handle == handle_simple_irq)
return "simple ";
#ifdef CONFIG_SMP
if (handle == handle_percpu_irq)
return "percpu ";
#endif
if (handle == handle_bad_irq)
return "bad ";
return NULL;
set_irq_chip(irq, chip);
__set_irq_handler(irq, handle, 0, name);
}