[PATCH] genirq: cleanup: no_irq_type -> no_irq_chip rename
Rename no_irq_type to no_irq_chip. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e76de9f8eb
commit
f1c2662cbc
@@ -45,7 +45,7 @@ handle_bad_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
|
|||||||
struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
|
struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
|
||||||
[0 ... NR_IRQS-1] = {
|
[0 ... NR_IRQS-1] = {
|
||||||
.status = IRQ_DISABLED,
|
.status = IRQ_DISABLED,
|
||||||
.chip = &no_irq_type,
|
.chip = &no_irq_chip,
|
||||||
.handle_irq = handle_bad_irq,
|
.handle_irq = handle_bad_irq,
|
||||||
.depth = 1,
|
.depth = 1,
|
||||||
.lock = SPIN_LOCK_UNLOCKED,
|
.lock = SPIN_LOCK_UNLOCKED,
|
||||||
@@ -79,8 +79,8 @@ static unsigned int noop_ret(unsigned int irq)
|
|||||||
/*
|
/*
|
||||||
* Generic no controller implementation
|
* Generic no controller implementation
|
||||||
*/
|
*/
|
||||||
struct hw_interrupt_type no_irq_type = {
|
struct irq_chip no_irq_chip = {
|
||||||
.typename = "none",
|
.name = "none",
|
||||||
.startup = noop_ret,
|
.startup = noop_ret,
|
||||||
.shutdown = noop,
|
.shutdown = noop,
|
||||||
.enable = noop,
|
.enable = noop,
|
||||||
|
@@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
|
|||||||
if (irq >= NR_IRQS)
|
if (irq >= NR_IRQS)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (desc->chip == &no_irq_type)
|
if (desc->chip == &no_irq_chip)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
/*
|
/*
|
||||||
* Some drivers like serial.c use request_irq() heavily,
|
* Some drivers like serial.c use request_irq() heavily,
|
||||||
|
@@ -117,7 +117,7 @@ void register_irq_proc(unsigned int irq)
|
|||||||
char name [MAX_NAMELEN];
|
char name [MAX_NAMELEN];
|
||||||
|
|
||||||
if (!root_irq_dir ||
|
if (!root_irq_dir ||
|
||||||
(irq_desc[irq].chip == &no_irq_type) ||
|
(irq_desc[irq].chip == &no_irq_chip) ||
|
||||||
irq_desc[irq].dir)
|
irq_desc[irq].dir)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user