From: Yinghai Lu <yhlu.kernel@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Dhaval Giani <dhaval@linux.vnet.ibm.com>,
Mike Travis <travis@sgi.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Yinghai Lu <yhlu.kernel@gmail.com>
Subject: [PATCH 12/25] drivers/pcmcia to use nr_irqs
Date: Sat, 2 Aug 2008 19:59:12 -0700 [thread overview]
Message-ID: <1217732365-16595-13-git-send-email-yhlu.kernel@gmail.com> (raw)
In-Reply-To: <1217732365-16595-12-git-send-email-yhlu.kernel@gmail.com>
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
next prev parent reply other threads:[~2008-08-03 3:04 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-03 2:59 [PATCH 00/25] dyn_array and nr_irqs support v3 Yinghai Lu
2008-08-03 2:59 ` [PATCH 01/25] x86: 64bit support more than 256 irq v2 Yinghai Lu
2008-08-03 2:59 ` [PATCH 02/25] x86: remove irq_vectors_limits Yinghai Lu
2008-08-03 2:59 ` [PATCH 03/25] add dyn_array support Yinghai Lu
2008-08-03 2:59 ` [PATCH 04/25] add per_cpu_dyn_array support Yinghai Lu
2008-08-03 2:59 ` [PATCH 05/25] x86: alloc dyn_array all alltogether Yinghai Lu
2008-08-03 2:59 ` [PATCH 06/25] x86: enable dyn_array support Yinghai Lu
2008-08-03 2:59 ` [PATCH 07/25] introduce nr_irqs Yinghai Lu
2008-08-03 2:59 ` [PATCH 08/25] x86: using nr_irqs Yinghai Lu
2008-08-03 2:59 ` [PATCH 09/25] drivers/char to use nr_irqs Yinghai Lu
2008-08-03 2:59 ` [PATCH 10/25] drivers/net " Yinghai Lu
2008-08-03 2:59 ` [PATCH 11/25] drivers intr remapping " Yinghai Lu
2008-08-03 2:59 ` Yinghai Lu [this message]
2008-08-03 2:59 ` [PATCH 13/25] drivers/rtc " Yinghai Lu
2008-08-03 2:59 ` [PATCH 14/25] drivers/scsi " Yinghai Lu
2008-08-03 2:59 ` [PATCH 15/25] drivers/serial " Yinghai Lu
2008-08-03 2:59 ` [PATCH 16/25] drivers proc " Yinghai Lu
2008-08-03 2:59 ` [PATCH 17/25] drivers xen events " Yinghai Lu
2008-08-03 2:59 ` [PATCH 18/25] make irq_timer_state to use dyn_array Yinghai Lu
2008-08-03 2:59 ` [PATCH 19/25] make irq2_iommu " Yinghai Lu
2008-08-03 2:59 ` [PATCH 20/25] make irq_desc " Yinghai Lu
2008-08-03 2:59 ` [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2 Yinghai Lu
2008-08-03 2:59 ` [PATCH 22/25] irq: make irqs in kernel stat use per_cpu_dyn_array Yinghai Lu
2008-08-03 2:59 ` [PATCH 23/25] x86: use dyn_array in io_apic_xx.c Yinghai Lu
2008-08-03 2:59 ` [PATCH 24/25] x86: get mp_irqs from madt Yinghai Lu
2008-08-03 2:59 ` [PATCH 25/25] x86: remove nr_irq_vectors Yinghai Lu
2008-08-03 13:03 ` [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2 Alan Cox
2008-08-03 15:14 ` Alan Cox
2008-08-03 19:57 ` Eric W. Biederman
2008-08-04 14:17 ` Alan Cox
2008-08-04 18:13 ` Yinghai Lu
2008-08-04 18:51 ` Eric W. Biederman
2008-08-06 13:09 ` [PATCH] serial: Remove NR_IRQS usage Alan Cox
2008-08-06 16:10 ` Eric W. Biederman
2008-08-03 13:02 ` [PATCH 15/25] drivers/serial to use nr_irqs Alan Cox
2008-08-03 17:43 ` Yinghai Lu
2008-08-03 4:16 ` [PATCH 05/25] x86: alloc dyn_array all alltogether Johannes Weiner
2008-08-03 4:03 ` [PATCH 03/25] add dyn_array support Johannes Weiner
2008-08-03 4:21 ` Yinghai Lu
2008-08-03 4:55 ` Johannes Weiner
2008-08-03 5:04 ` Yinghai Lu
2008-08-03 5:31 ` Johannes Weiner
2008-08-03 5:39 ` Yinghai Lu
2008-08-03 5:40 ` Yinghai Lu
2008-08-03 5:47 ` Johannes Weiner
2008-08-03 5:48 ` Yinghai Lu
2008-08-03 5:51 ` [PATCH 00/25] dyn_array and nr_irqs support v3 Eric W. Biederman
2008-08-03 6:04 ` Yinghai Lu
2008-08-03 6:39 ` Eric W. Biederman
2008-08-03 8:25 ` Yinghai Lu
2008-08-03 9:15 ` Eric W. Biederman
2008-08-03 17:54 ` Yinghai Lu
2008-08-03 19:20 ` Yinghai Lu
2008-08-04 1:59 ` Yinghai Lu
2008-08-04 14:31 ` Mike Travis
2008-08-05 23:01 ` H. Peter Anvin
2008-08-05 23:15 ` Yinghai Lu
2008-08-05 23:26 ` H. Peter Anvin
2008-08-05 23:53 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1217732365-16595-13-git-send-email-yhlu.kernel@gmail.com \
--to=yhlu.kernel@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=dhaval@linux.vnet.ibm.com \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=travis@sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox