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/33] drivers/pcmcia to use nr_irqs
Date: Wed, 6 Aug 2008 01:42:54 -0700 [thread overview]
Message-ID: <1218012195-10429-13-git-send-email-yhlu.kernel@gmail.com> (raw)
In-Reply-To: <1218012195-10429-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-06 8:49 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-06 8:42 [PATCH 00/33] dyn_array and nr_irqs support v4 Yinghai Lu
2008-08-06 8:42 ` [PATCH 01/33] x86: add after_bootmem for 32bit Yinghai Lu
2008-08-06 8:42 ` [PATCH 02/33] x86: remove irq_vectors_limits Yinghai Lu
2008-08-06 8:42 ` [PATCH 03/33] add dyn_array support Yinghai Lu
2008-08-06 8:42 ` [PATCH 04/33] add per_cpu_dyn_array support Yinghai Lu
2008-08-06 8:42 ` [PATCH 05/33] x86: alloc dyn_array all alltogether Yinghai Lu
2008-08-06 8:42 ` [PATCH 06/33] x86: enable dyn_array support Yinghai Lu
2008-08-06 8:42 ` [PATCH 07/33] introduce nr_irqs Yinghai Lu
2008-08-06 8:42 ` [PATCH 08/33] x86: using nr_irqs Yinghai Lu
2008-08-06 8:42 ` [PATCH 09/33] drivers/char to use nr_irqs Yinghai Lu
2008-08-06 8:42 ` [PATCH 10/33] drivers/net " Yinghai Lu
2008-08-06 8:42 ` [PATCH 11/33] drivers intr remapping " Yinghai Lu
2008-08-06 8:42 ` Yinghai Lu [this message]
2008-08-06 8:42 ` [PATCH 13/33] drivers/rtc " Yinghai Lu
2008-08-06 8:42 ` [PATCH 14/33] drivers/scsi " Yinghai Lu
2008-08-06 8:42 ` [PATCH 15/33] drivers/serial " Yinghai Lu
2008-08-06 8:42 ` [PATCH 16/33] drivers proc " Yinghai Lu
2008-08-06 8:42 ` [PATCH 17/33] drivers xen events " Yinghai Lu
2008-08-06 8:43 ` [PATCH 18/33] make irq_timer_state to use dyn_array Yinghai Lu
2008-08-06 8:43 ` [PATCH 19/33] make irq2_iommu " Yinghai Lu
2008-08-06 8:43 ` [PATCH 20/33] make irq_desc " Yinghai Lu
2008-08-06 8:43 ` [PATCH 21/33] serial: change remove NR_IRQS in 8250.c v2 Yinghai Lu
2008-08-06 8:43 ` [PATCH 22/33] irq: make irqs in kernel stat use per_cpu_dyn_array Yinghai Lu
2008-08-06 8:43 ` [PATCH 23/33] x86: use dyn_array in io_apic_xx.c Yinghai Lu
2008-08-06 8:43 ` [PATCH 24/33] x86: get mp_irqs from madt Yinghai Lu
2008-08-06 8:43 ` [PATCH 25/33] x86: remove nr_irq_vectors Yinghai Lu
2008-08-06 8:43 ` [PATCH 26/33] x86_64: use get_irq_desc together with dyn_array Yinghai Lu
2008-08-06 8:43 ` [PATCH 27/33] x86: add get_irq_cfg in io_apic_64.c Yinghai Lu
2008-08-06 8:43 ` [PATCH 28/33] x86: put irq_2_pin pointer into irq_cfg Yinghai Lu
2008-08-06 8:43 ` [PATCH 29/33] x86: put timer_rand_state pointer into irq_desc Yinghai Lu
2008-08-06 8:43 ` [PATCH 30/33] x86: move kstat_irqs from kstat to irq_desc Yinghai Lu
2008-08-06 8:43 ` [PATCH 31/33] replace loop with nr_irqs with for_each_irq_desc Yinghai Lu
2008-08-06 8:43 ` [PATCH 32/33] remove >= nr_irqs checking with config_have_sparse_irq Yinghai Lu
2008-08-06 8:43 ` [PATCH 33/33] x86_64: add irq_desc in function in paramater Yinghai Lu
2008-08-06 10:29 ` [PATCH 32/33] remove >= nr_irqs checking with config_have_sparse_irq 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=1218012195-10429-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