Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a06148c36d3163aee4d5d2cad4e87032d74eaa6d

Authored by Yinghai Lu
Committed by Ingo Molnar
1 parent 60e4ad7a72
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

drivers/pci/ intr remapping: use nr_irqs 

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff

drivers/pci/intr_remapping.c
Diff comments   View file @ a06148c
... ... @@ -22,7 +22,7 @@
22 22  
23 23 int irq_remapped(int irq)
24 24 {
25   - if (irq > NR_IRQS)
  25 + if (irq > nr_irqs)
26 26 return 0;
27 27  
28 28 if (!irq_2_iommu[irq].iommu)
... ... @@ -35,7 +35,7 @@
35 35 {
36 36 int index;
37 37  
38   - if (!entry || irq > NR_IRQS)
  38 + if (!entry || irq > nr_irqs)
39 39 return -1;
40 40  
41 41 spin_lock(&irq_2_ir_lock);
... ... @@ -126,7 +126,7 @@
126 126 int index;
127 127  
128 128 spin_lock(&irq_2_ir_lock);
129   - if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
  129 + if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
130 130 spin_unlock(&irq_2_ir_lock);
131 131 return -1;
132 132 }
... ... @@ -140,7 +140,7 @@
140 140 int set_irte_irq(int irq, struct intel_iommu *iommu, u16 index, u16 subhandle)
141 141 {
142 142 spin_lock(&irq_2_ir_lock);
143   - if (irq >= NR_IRQS || irq_2_iommu[irq].iommu) {
  143 + if (irq >= nr_irqs || irq_2_iommu[irq].iommu) {
144 144 spin_unlock(&irq_2_ir_lock);
145 145 return -1;
146 146 }
... ... @@ -158,7 +158,7 @@
158 158 int clear_irte_irq(int irq, struct intel_iommu *iommu, u16 index)
159 159 {
160 160 spin_lock(&irq_2_ir_lock);
161   - if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
  161 + if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
162 162 spin_unlock(&irq_2_ir_lock);
163 163 return -1;
164 164 }
... ... @@ -180,7 +180,7 @@
180 180 struct intel_iommu *iommu;
181 181  
182 182 spin_lock(&irq_2_ir_lock);
183   - if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
  183 + if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
184 184 spin_unlock(&irq_2_ir_lock);
185 185 return -1;
186 186 }
... ... @@ -205,7 +205,7 @@
205 205 struct intel_iommu *iommu;
206 206  
207 207 spin_lock(&irq_2_ir_lock);
208   - if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
  208 + if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
209 209 spin_unlock(&irq_2_ir_lock);
210 210 return -1;
211 211 }
... ... @@ -248,7 +248,7 @@
248 248 struct intel_iommu *iommu;
249 249  
250 250 spin_lock(&irq_2_ir_lock);
251   - if (irq >= NR_IRQS || !irq_2_iommu[irq].iommu) {
  251 + if (irq >= nr_irqs || !irq_2_iommu[irq].iommu) {
252 252 spin_unlock(&irq_2_ir_lock);
253 253 return -1;
254 254 }