aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/irq/handle.c6
-rw-r--r--kernel/irq/manage.c2
-rw-r--r--kernel/irq/proc.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 3a2dbcc9e215..01fc7f79d74a 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -45,7 +45,7 @@ handle_bad_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
45struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = { 45struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
46 [0 ... NR_IRQS-1] = { 46 [0 ... NR_IRQS-1] = {
47 .status = IRQ_DISABLED, 47 .status = IRQ_DISABLED,
48 .chip = &no_irq_type, 48 .chip = &no_irq_chip,
49 .handle_irq = handle_bad_irq, 49 .handle_irq = handle_bad_irq,
50 .depth = 1, 50 .depth = 1,
51 .lock = SPIN_LOCK_UNLOCKED, 51 .lock = SPIN_LOCK_UNLOCKED,
@@ -79,8 +79,8 @@ static unsigned int noop_ret(unsigned int irq)
79/* 79/*
80 * Generic no controller implementation 80 * Generic no controller implementation
81 */ 81 */
82struct hw_interrupt_type no_irq_type = { 82struct irq_chip no_irq_chip = {
83 .typename = "none", 83 .name = "none",
84 .startup = noop_ret, 84 .startup = noop_ret,
85 .shutdown = noop, 85 .shutdown = noop,
86 .enable = noop, 86 .enable = noop,
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 627d401c2979..9eb1d518ee1c 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
199 if (irq >= NR_IRQS) 199 if (irq >= NR_IRQS)
200 return -EINVAL; 200 return -EINVAL;
201 201
202 if (desc->chip == &no_irq_type) 202 if (desc->chip == &no_irq_chip)
203 return -ENOSYS; 203 return -ENOSYS;
204 /* 204 /*
205 * Some drivers like serial.c use request_irq() heavily, 205 * Some drivers like serial.c use request_irq() heavily,
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index f60b85b61e8b..607c7809ad01 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -117,7 +117,7 @@ void register_irq_proc(unsigned int irq)
117 char name [MAX_NAMELEN]; 117 char name [MAX_NAMELEN];
118 118
119 if (!root_irq_dir || 119 if (!root_irq_dir ||
120 (irq_desc[irq].chip == &no_irq_type) || 120 (irq_desc[irq].chip == &no_irq_chip) ||
121 irq_desc[irq].dir) 121 irq_desc[irq].dir)
122 return; 122 return;
123 123