[PATCH 11/25] drivers intr remapping to use nr_irqs

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Saturday, August 2, 2008 - 7:59 pm

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 drivers/pci/intr_remapping.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c
index bb642cc..980566e 100644
--- a/drivers/pci/intr_remapping.c
+++ b/drivers/pci/intr_remapping.c
@@ -22,7 +22,7 @@ static DEFINE_SPINLOCK(irq_2_ir_lock);
 
 int irq_remapped(int irq)
 {
-	if (irq > NR_IRQS)
+	if (irq > nr_irqs)
 		return 0;
 
 	if (!irq_2_iommu[irq].iommu)
@@ -35,7 +35,7 @@ int get_irte(int irq, struct irte *entry)
 {
 	int index;
 
-	if (!entry || irq > NR_IRQS)
+	if (!entry || irq > nr_irqs)
 		return -1;
 
 	spin_lock(&irq_2_ir_lock);
@@ -126,7 +126,7 @@ int map_irq_to_irte_handle(int irq, u16 *sub_handle)
 	int index;
 
 	spin_lock(&irq_2_ir_lock);
-	if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
+	if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
 		spin_unlock(&irq_2_ir_lock);
 		return -1;
 	}
@@ -140,7 +140,7 @@ int map_irq_to_irte_handle(int irq, u16 *sub_handle)
 int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
 {
 	spin_lock(&irq_2_ir_lock);
-	if (irq >= NR_IRQS || irq_2_iommu[irq].iommu) {
+	if (irq >= nr_irqs || irq_2_iommu[irq].iommu) {
 		spin_unlock(&irq_2_ir_lock);
 		return -1;
 	}
@@ -158,7 +158,7 @@ int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
 int clear_irte_irq(int irq, struct intel_iommu *iommu, u16 index)
 {
 	spin_lock(&irq_2_ir_lock);
-	if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
+	if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
 		spin_unlock(&irq_2_ir_lock);
 		return -1;
 	}
@@ -180,7 +180,7 @@ int modify_irte(int irq, struct irte *irte_modified)
 	struct intel_iommu *iommu;
 
 	spin_lock(&irq_2_ir_lock);
-	if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
+	if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
 		spin_unlock(&irq_2_ir_lock);
 		return -1;
 	}
@@ -205,7 +205,7 @@ int flush_irte(int irq)
 	struct intel_iommu *iommu;
 
 	spin_lock(&irq_2_ir_lock);
-	if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
+	if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
 		spin_unlock(&irq_2_ir_lock);
 		return -1;
 	}
@@ -248,7 +248,7 @@ int free_irte(int irq)
 	struct intel_iommu *iommu;
 
 	spin_lock(&irq_2_ir_lock);
-	if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
+	if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
 		spin_unlock(&irq_2_ir_lock);
 		return -1;
 	}
-- 
1.5.4.5

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

Messages in current thread:
[PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 02/25] x86: remove irq_vectors_limits, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 04/25] add per_cpu_dyn_array support, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 05/25] x86: alloc dyn_array all alltogether, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 06/25] x86: enable dyn_array support, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 07/25] introduce nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 08/25] x86: using nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 09/25] drivers/char to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 10/25] drivers/net to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 11/25] drivers intr remapping to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 12/25] drivers/pcmcia to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 13/25] drivers/rtc to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 14/25] drivers/scsi to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 15/25] drivers/serial to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 16/25] drivers proc to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 17/25] drivers xen events to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 18/25] make irq_timer_state to use dyn_array, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 19/25] make irq2_iommu to use dyn_array, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 20/25] make irq_desc to use dyn_array, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 23/25] x86: use dyn_array in io_apic_xx.c, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 24/25] x86: get mp_irqs from madt, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 25/25] x86: remove nr_irq_vectors, Yinghai Lu, (Sat Aug 2, 7:59 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 9:03 pm)
Re: [PATCH 05/25] x86: alloc dyn_array all alltogether, Johannes Weiner, (Sat Aug 2, 9:16 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 9:21 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 9:55 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:04 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 10:31 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:39 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:40 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 10:47 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:48 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sat Aug 2, 10:51 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sat Aug 2, 11:04 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sat Aug 2, 11:39 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 1:25 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sun Aug 3, 2:15 am)
Re: [PATCH 15/25] drivers/serial to use nr_irqs, Alan Cox, (Sun Aug 3, 6:02 am)
Re: [PATCH 15/25] drivers/serial to use nr_irqs, Yinghai Lu, (Sun Aug 3, 10:43 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 10:54 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 12:20 pm)
Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2, Eric W. Biederman, (Sun Aug 3, 12:57 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 6:59 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Mike Travis, (Mon Aug 4, 7:31 am)
Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2, Eric W. Biederman, (Mon Aug 4, 11:51 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, H. Peter Anvin, (Tue Aug 5, 4:01 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Tue Aug 5, 4:15 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, H. Peter Anvin, (Tue Aug 5, 4:26 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Tue Aug 5, 4:53 pm)
[PATCH] serial: Remove NR_IRQS usage, Alan Cox, (Wed Aug 6, 6:09 am)
Re: [PATCH] serial: Remove NR_IRQS usage, Eric W. Biederman, (Wed Aug 6, 9:10 am)