diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 23:49:47 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:52:05 -0400 |
commit | 85c0f90978bf50596dbd23854648020f1f9b5bfd (patch) | |
tree | f66c598bb37b925dd6c74e4ce1fb06345c742c01 /kernel/irq/autoprobe.c | |
parent | 6da55c3e8da88e8a7cb6452160776ad6706798ad (diff) |
irq: introduce nr_irqs
at this point nr_irqs is equal NR_IRQS
convert a few easy users from NR_IRQS to dynamic nr_irqs.
v2: according to Eric, we need to take care of arch without generic_hardirqs
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/autoprobe.c')
-rw-r--r-- | kernel/irq/autoprobe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c index 533068cfb607..c689e9851a80 100644 --- a/kernel/irq/autoprobe.c +++ b/kernel/irq/autoprobe.c | |||
@@ -38,7 +38,7 @@ unsigned long probe_irq_on(void) | |||
38 | * something may have generated an irq long ago and we want to | 38 | * something may have generated an irq long ago and we want to |
39 | * flush such a longstanding irq before considering it as spurious. | 39 | * flush such a longstanding irq before considering it as spurious. |
40 | */ | 40 | */ |
41 | for (i = NR_IRQS-1; i > 0; i--) { | 41 | for (i = nr_irqs-1; i > 0; i--) { |
42 | desc = irq_desc + i; | 42 | desc = irq_desc + i; |
43 | 43 | ||
44 | spin_lock_irq(&desc->lock); | 44 | spin_lock_irq(&desc->lock); |
@@ -68,7 +68,7 @@ unsigned long probe_irq_on(void) | |||
68 | * (we must startup again here because if a longstanding irq | 68 | * (we must startup again here because if a longstanding irq |
69 | * happened in the previous stage, it may have masked itself) | 69 | * happened in the previous stage, it may have masked itself) |
70 | */ | 70 | */ |
71 | for (i = NR_IRQS-1; i > 0; i--) { | 71 | for (i = nr_irqs-1; i > 0; i--) { |
72 | desc = irq_desc + i; | 72 | desc = irq_desc + i; |
73 | 73 | ||
74 | spin_lock_irq(&desc->lock); | 74 | spin_lock_irq(&desc->lock); |
@@ -89,7 +89,7 @@ unsigned long probe_irq_on(void) | |||
89 | * Now filter out any obviously spurious interrupts | 89 | * Now filter out any obviously spurious interrupts |
90 | */ | 90 | */ |
91 | mask = 0; | 91 | mask = 0; |
92 | for (i = 0; i < NR_IRQS; i++) { | 92 | for (i = 0; i < nr_irqs; i++) { |
93 | unsigned int status; | 93 | unsigned int status; |
94 | 94 | ||
95 | desc = irq_desc + i; | 95 | desc = irq_desc + i; |
@@ -130,7 +130,7 @@ unsigned int probe_irq_mask(unsigned long val) | |||
130 | int i; | 130 | int i; |
131 | 131 | ||
132 | mask = 0; | 132 | mask = 0; |
133 | for (i = 0; i < NR_IRQS; i++) { | 133 | for (i = 0; i < nr_irqs; i++) { |
134 | struct irq_desc *desc = irq_desc + i; | 134 | struct irq_desc *desc = irq_desc + i; |
135 | unsigned int status; | 135 | unsigned int status; |
136 | 136 | ||
@@ -173,7 +173,7 @@ int probe_irq_off(unsigned long val) | |||
173 | { | 173 | { |
174 | int i, irq_found = 0, nr_irqs = 0; | 174 | int i, irq_found = 0, nr_irqs = 0; |
175 | 175 | ||
176 | for (i = 0; i < NR_IRQS; i++) { | 176 | for (i = 0; i < nr_irqs; i++) { |
177 | struct irq_desc *desc = irq_desc + i; | 177 | struct irq_desc *desc = irq_desc + i; |
178 | unsigned int status; | 178 | unsigned int status; |
179 | 179 | ||