aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-08-19 23:49:49 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:52:05 -0400
commit1f45f5621df82033cb4964d03530ade2f9a25e7b (patch)
tree4f536a6df75a0d0885853c8baabbc7108d54bce3
parent0799e432acfda879eaeef9622426bfa1434f3786 (diff)
drivers/char: use nr_irqs
convert them to nr_irqs. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/char/hpet.c2
-rw-r--r--drivers/char/random.c4
-rw-r--r--drivers/char/vr41xx_giu.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index f3cfb4c76125..408f5f92cb4e 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -219,7 +219,7 @@ static void hpet_timer_set_irq(struct hpet_dev *devp)
219 for (irq = find_first_bit(&v, HPET_MAX_IRQ); irq < HPET_MAX_IRQ; 219 for (irq = find_first_bit(&v, HPET_MAX_IRQ); irq < HPET_MAX_IRQ;
220 irq = find_next_bit(&v, HPET_MAX_IRQ, 1 + irq)) { 220 irq = find_next_bit(&v, HPET_MAX_IRQ, 1 + irq)) {
221 221
222 if (irq >= NR_IRQS) { 222 if (irq >= nr_irqs) {
223 irq = HPET_MAX_IRQ; 223 irq = HPET_MAX_IRQ;
224 break; 224 break;
225 } 225 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 6af435b89867..31456472829e 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -648,7 +648,7 @@ EXPORT_SYMBOL_GPL(add_input_randomness);
648 648
649void add_interrupt_randomness(int irq) 649void add_interrupt_randomness(int irq)
650{ 650{
651 if (irq >= NR_IRQS || irq_timer_state[irq] == NULL) 651 if (irq >= nr_irqs || irq_timer_state[irq] == NULL)
652 return; 652 return;
653 653
654 DEBUG_ENT("irq event %d\n", irq); 654 DEBUG_ENT("irq event %d\n", irq);
@@ -912,7 +912,7 @@ void rand_initialize_irq(int irq)
912{ 912{
913 struct timer_rand_state *state; 913 struct timer_rand_state *state;
914 914
915 if (irq >= NR_IRQS || irq_timer_state[irq]) 915 if (irq >= nr_irqs || irq_timer_state[irq])
916 return; 916 return;
917 917
918 /* 918 /*
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index ffe9b4e3072e..54c837288d19 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -641,7 +641,7 @@ static int __devinit giu_probe(struct platform_device *dev)
641 } 641 }
642 642
643 irq = platform_get_irq(dev, 0); 643 irq = platform_get_irq(dev, 0);
644 if (irq < 0 || irq >= NR_IRQS) 644 if (irq < 0 || irq >= nr_irqs)
645 return -EBUSY; 645 return -EBUSY;
646 646
647 return cascade_irq(irq, giu_get_irq); 647 return cascade_irq(irq, giu_get_irq);