[PATCH 13/42] drivers/pcmcia to use nr_irqs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Friday, August 8, 2008 - 2:52 pm

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 drivers/pcmcia/at91_cf.c      |    2 +-
 drivers/pcmcia/vrc4171_card.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 6849685..194c8ba 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -273,7 +273,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
 			goto fail0d;
 		cf->socket.pci_irq = board->irq_pin;
 	} else
-		cf->socket.pci_irq = NR_IRQS + 1;
+		cf->socket.pci_irq = nr_irqs + 1;
 
 	/* pcmcia layer only remaps "real" memory not iospace */
 	cf->socket.io_offset = (unsigned long)
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index eee2f1c..b2c4124 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -639,7 +639,7 @@ static int __devinit vrc4171_card_setup(char *options)
 		int irq;
 		options += 4;
 		irq = simple_strtoul(options, &options, 0);
-		if (irq >= 0 && irq < NR_IRQS)
+		if (irq >= 0 && irq < nr_irqs)
 			vrc4171_irq = irq;
 
 		if (*options != ',')
-- 
1.5.4.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 01/42] 8250: Remove NR_IRQ usage, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 02/42] x86: add after_bootmem for 32bit, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 03/42] x86: remove irq_vectors_limits, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 04/42] add dyn_array support, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 05/42] add per_cpu_dyn_array support, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 06/42] x86: alloc dyn_array all alltogether, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 07/42] x86: enable dyn_array support, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 09/42] x86: using nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 10/42] drivers/char to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 11/42] drivers/net to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 12/42] drivers intr remapping to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 13/42] drivers/pcmcia to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 14/42] drivers/rtc to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 15/42] drivers/scsi to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 16/42] drivers/serial to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 17/42] drivers proc to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 18/42] drivers xen events to use nr_irqs, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 19/42] make irq_timer_state to use dyn_array, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 20/42] make irq2_iommu to use dyn_array, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 21/42] make irq_desc to use dyn_array, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 23/42] x86: use dyn_array in io_apic_xx.c, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 24/42] x86: get mp_irqs from madt, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 25/42] x86: remove nr_irq_vectors, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 27/42] x86: add irq_cfg in io_apic_64.c, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 36/42] x86_64: introduce irq_cfg_with_new, Yinghai Lu, (Fri Aug 8, 2:52 pm)
[PATCH 37/42] x86_64: introduce irq_desc_with_new, Yinghai Lu, (Fri Aug 8, 2:52 pm)
Re: [PATCH 00/42] dyn_array/nr_irqs/sparse_irq support v5, H. Peter Anvin, (Fri Aug 8, 3:01 pm)
Re: [PATCH 00/42] dyn_array/nr_irqs/sparse_irq support v5, H. Peter Anvin, (Fri Aug 8, 3:19 pm)
Re: [PATCH 00/42] dyn_array/nr_irqs/sparse_irq support v5, H. Peter Anvin, (Fri Aug 8, 3:25 pm)
Re: [PATCH 00/42] dyn_array/nr_irqs/sparse_irq support v5, H. Peter Anvin, (Fri Aug 8, 3:33 pm)
Re: [PATCH 01/42] 8250: Remove NR_IRQ usage, Eric W. Biederman, (Fri Aug 8, 3:38 pm)
Re: [PATCH 01/42] 8250: Remove NR_IRQ usage, Yinghai Lu, (Fri Aug 8, 4:07 pm)
Re: [PATCH 00/42] dyn_array/nr_irqs/sparse_irq support v5, Eric W. Biederman, (Fri Aug 8, 4:40 pm)
Re: [PATCH 08/42] introduce nr_irqs, Eric W. Biederman, (Fri Aug 8, 6:00 pm)
Re: [PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Fri Aug 8, 6:38 pm)
Re: [PATCH 08/42] introduce nr_irqs, H. Peter Anvin, (Fri Aug 8, 6:59 pm)
Re: [PATCH 08/42] introduce nr_irqs, Eric W. Biederman, (Fri Aug 8, 11:07 pm)
Re: [PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Sat Aug 9, 12:30 am)
Re: [PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Sat Aug 9, 12:30 am)
Re: [PATCH 08/42] introduce nr_irqs, Eric W. Biederman, (Sat Aug 9, 8:46 am)
Re: [PATCH 08/42] introduce nr_irqs, Eric W. Biederman, (Sat Aug 9, 9:02 am)
Re: [PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Sat Aug 9, 2:21 pm)
Re: [PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Sat Aug 9, 2:37 pm)
Re: [PATCH 08/42] introduce nr_irqs, Eric W. Biederman, (Sat Aug 9, 2:38 pm)
Re: [PATCH 08/42] introduce nr_irqs, Yinghai Lu, (Sat Aug 9, 3:35 pm)