diff options
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index d363f32dba7d..d5a4333d8f1f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -34,7 +34,7 @@ void synchronize_irq(unsigned int irq) | |||
34 | struct irq_desc *desc = irq_desc + irq; | 34 | struct irq_desc *desc = irq_desc + irq; |
35 | unsigned int status; | 35 | unsigned int status; |
36 | 36 | ||
37 | if (irq >= NR_IRQS) | 37 | if (irq >= nr_irqs) |
38 | return; | 38 | return; |
39 | 39 | ||
40 | do { | 40 | do { |
@@ -143,7 +143,7 @@ void disable_irq_nosync(unsigned int irq) | |||
143 | struct irq_desc *desc = irq_desc + irq; | 143 | struct irq_desc *desc = irq_desc + irq; |
144 | unsigned long flags; | 144 | unsigned long flags; |
145 | 145 | ||
146 | if (irq >= NR_IRQS) | 146 | if (irq >= nr_irqs) |
147 | return; | 147 | return; |
148 | 148 | ||
149 | spin_lock_irqsave(&desc->lock, flags); | 149 | spin_lock_irqsave(&desc->lock, flags); |
@@ -171,7 +171,7 @@ void disable_irq(unsigned int irq) | |||
171 | { | 171 | { |
172 | struct irq_desc *desc = irq_desc + irq; | 172 | struct irq_desc *desc = irq_desc + irq; |
173 | 173 | ||
174 | if (irq >= NR_IRQS) | 174 | if (irq >= nr_irqs) |
175 | return; | 175 | return; |
176 | 176 | ||
177 | disable_irq_nosync(irq); | 177 | disable_irq_nosync(irq); |
@@ -214,7 +214,7 @@ void enable_irq(unsigned int irq) | |||
214 | struct irq_desc *desc = irq_desc + irq; | 214 | struct irq_desc *desc = irq_desc + irq; |
215 | unsigned long flags; | 215 | unsigned long flags; |
216 | 216 | ||
217 | if (irq >= NR_IRQS) | 217 | if (irq >= nr_irqs) |
218 | return; | 218 | return; |
219 | 219 | ||
220 | spin_lock_irqsave(&desc->lock, flags); | 220 | spin_lock_irqsave(&desc->lock, flags); |
@@ -290,7 +290,7 @@ int can_request_irq(unsigned int irq, unsigned long irqflags) | |||
290 | { | 290 | { |
291 | struct irqaction *action; | 291 | struct irqaction *action; |
292 | 292 | ||
293 | if (irq >= NR_IRQS || irq_desc[irq].status & IRQ_NOREQUEST) | 293 | if (irq >= nr_irqs || irq_desc[irq].status & IRQ_NOREQUEST) |
294 | return 0; | 294 | return 0; |
295 | 295 | ||
296 | action = irq_desc[irq].action; | 296 | action = irq_desc[irq].action; |
@@ -356,7 +356,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) | |||
356 | int shared = 0; | 356 | int shared = 0; |
357 | int ret; | 357 | int ret; |
358 | 358 | ||
359 | if (irq >= NR_IRQS) | 359 | if (irq >= nr_irqs) |
360 | return -EINVAL; | 360 | return -EINVAL; |
361 | 361 | ||
362 | if (desc->chip == &no_irq_chip) | 362 | if (desc->chip == &no_irq_chip) |
@@ -515,7 +515,7 @@ void free_irq(unsigned int irq, void *dev_id) | |||
515 | unsigned long flags; | 515 | unsigned long flags; |
516 | 516 | ||
517 | WARN_ON(in_interrupt()); | 517 | WARN_ON(in_interrupt()); |
518 | if (irq >= NR_IRQS) | 518 | if (irq >= nr_irqs) |
519 | return; | 519 | return; |
520 | 520 | ||
521 | desc = irq_desc + irq; | 521 | desc = irq_desc + irq; |
@@ -630,7 +630,7 @@ int request_irq(unsigned int irq, irq_handler_t handler, | |||
630 | */ | 630 | */ |
631 | if ((irqflags & IRQF_SHARED) && !dev_id) | 631 | if ((irqflags & IRQF_SHARED) && !dev_id) |
632 | return -EINVAL; | 632 | return -EINVAL; |
633 | if (irq >= NR_IRQS) | 633 | if (irq >= nr_irqs) |
634 | return -EINVAL; | 634 | return -EINVAL; |
635 | if (irq_desc[irq].status & IRQ_NOREQUEST) | 635 | if (irq_desc[irq].status & IRQ_NOREQUEST) |
636 | return -EINVAL; | 636 | return -EINVAL; |