public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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 14/43] drivers/pcmcia to use nr_irqs
Date: Sun, 10 Aug 2008 00:36:03 -0700	[thread overview]
Message-ID: <1218353792-3355-15-git-send-email-yhlu.kernel@gmail.com> (raw)
In-Reply-To: <1218353792-3355-14-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


  reply	other threads:[~2008-08-10  7:42 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-10  7:35 [PATCH 00/43] dyn_array/nr_irqs/sparse_irq support v7 Yinghai Lu
2008-08-10  7:35 ` [PATCH 01/43] x86_64: Restore the proper NR_IRQS define so larger systems work Yinghai Lu
2008-08-10  7:35   ` [PATCH 02/43] 8250: Remove NR_IRQ usage Yinghai Lu
2008-08-10  7:35     ` [PATCH 03/43] x86: add after_bootmem for 32bit Yinghai Lu
2008-08-10  7:35       ` [PATCH 04/43] x86: remove irq_vectors_limits Yinghai Lu
2008-08-10  7:35         ` [PATCH 05/43] add dyn_array support Yinghai Lu
2008-08-10  7:35           ` [PATCH 06/43] add per_cpu_dyn_array support Yinghai Lu
2008-08-10  7:35             ` [PATCH 07/43] x86: alloc dyn_array all alltogether Yinghai Lu
2008-08-10  7:35               ` [PATCH 08/43] x86: enable dyn_array support Yinghai Lu
2008-08-10  7:35                 ` [PATCH 09/43] introduce nr_irqs Yinghai Lu
2008-08-10  7:35                   ` [PATCH 10/43] x86: using nr_irqs Yinghai Lu
2008-08-10  7:36                     ` [PATCH 11/43] drivers/char to use nr_irqs Yinghai Lu
2008-08-10  7:36                       ` [PATCH 12/43] drivers/net " Yinghai Lu
2008-08-10  7:36                         ` [PATCH 13/43] drivers intr remapping " Yinghai Lu
2008-08-10  7:36                           ` Yinghai Lu [this message]
2008-08-10  7:36                             ` [PATCH 15/43] drivers/rtc " Yinghai Lu
2008-08-10  7:36                               ` [PATCH 16/43] drivers/scsi " Yinghai Lu
2008-08-10  7:36                                 ` [PATCH 17/43] drivers/serial " Yinghai Lu
2008-08-10  7:36                                   ` [PATCH 18/43] drivers proc " Yinghai Lu
2008-08-10  7:36                                     ` [PATCH 19/43] drivers xen events " Yinghai Lu
2008-08-10  7:36                                       ` [PATCH 20/43] make irq_timer_state to use dyn_array Yinghai Lu
2008-08-10  7:36                                         ` [PATCH 21/43] make irq2_iommu " Yinghai Lu
2008-08-10  7:36                                           ` [PATCH 22/43] make irq_desc " Yinghai Lu
2008-08-10  7:36                                             ` [PATCH 23/43] irq: make irqs in kernel stat use per_cpu_dyn_array Yinghai Lu
2008-08-10  7:36                                               ` [PATCH 24/43] x86: use dyn_array in io_apic_xx.c Yinghai Lu
2008-08-10  7:36                                                 ` [PATCH 25/43] x86: get mp_irqs from madt Yinghai Lu
2008-08-10  7:36                                                   ` [PATCH 26/43] x86: remove nr_irq_vectors Yinghai Lu
2008-08-10  7:36                                                     ` [PATCH 27/43] x86_64: use irq_desc() together with dyn_array Yinghai Lu
2008-08-10  7:36                                                       ` [PATCH 28/43] x86: add irq_cfg in io_apic_64.c Yinghai Lu
2008-08-10  7:36                                                         ` [PATCH 29/43] x86: put irq_2_pin pointer into irq_cfg Yinghai Lu
2008-08-10  7:36                                                           ` [PATCH 30/43] x86: put timer_rand_state pointer into irq_desc Yinghai Lu
2008-08-10  7:36                                                             ` [PATCH 31/43] x86: move kstat_irqs from kstat to irq_desc Yinghai Lu
2008-08-10  7:36                                                               ` [PATCH 32/43] add irq_desc_without_new Yinghai Lu
2008-08-10  7:36                                                                 ` [PATCH 33/43] replace loop with nr_irqs with for_each_irq_desc Yinghai Lu
2008-08-10  7:36                                                                   ` [PATCH 34/43] replace loop with nr_irqs for proc/stat Yinghai Lu
2008-08-10  7:36                                                                     ` [PATCH 35/43] replace loop with nr_irqs with for_each_irq_icfg Yinghai Lu
2008-08-10  7:36                                                                       ` [PATCH 36/43] remove >= nr_irqs checking with config_have_sparse_irq Yinghai Lu
2008-08-10  7:36                                                                         ` [PATCH 37/43] x86_64: add irq_desc in function in paramater Yinghai Lu
2008-08-10  7:36                                                                           ` [PATCH 38/43] x86: check with without_new in show_interrupts Yinghai Lu
2008-08-10  7:36                                                                             ` [PATCH 39/43] x86_64: rename irq_desc/irq_desc_with_new Yinghai Lu
2008-08-10  7:36                                                                               ` [PATCH 40/43] seperate irq_descX with irq_descX_free Yinghai Lu
2008-08-10  7:36                                                                                 ` [PATCH 41/43] x86_64: sperate irq_cfgx with irq_cfgx_free Yinghai Lu
2008-08-10  7:36                                                                                   ` [PATCH 42/43] x86_64: make /proc/interrupts works with dyn irq_desc Yinghai Lu
2008-08-10  7:36                                                                                     ` [PATCH 43/43] x86: put irq_2_iommu pointer into irq_desc Yinghai Lu
2008-08-10  9:21 ` [PATCH 00/43] dyn_array/nr_irqs/sparse_irq support v7 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=1218353792-3355-15-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