Commit
9130addad2fb2bbe1847f13c838438ff10a66d3a
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/pcmcia: use nr_irqs
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Showing
2 changed files
with
2 additions
and
2 deletions
Side-by-side Diff
| ... |
... |
@@ -273,7 +273,7 @@ |
|
273
|
273 |
goto fail0d; |
|
274
|
274 |
cf->socket.pci_irq = board->irq_pin; |
|
275
|
275 |
} else |
|
276
|
|
- cf->socket.pci_irq = NR_IRQS + 1; |
|
|
276 |
+ cf->socket.pci_irq = nr_irqs + 1; |
|
277
|
277 |
|
|
278
|
278 |
/* pcmcia layer only remaps "real" memory not iospace */ |
|
279
|
279 |
cf->socket.io_offset = (unsigned long) |
| ... |
... |
@@ -639,7 +639,7 @@ |
|
639
|
639 |
int irq; |
|
640
|
640 |
options += 4; |
|
641
|
641 |
irq = simple_strtoul(options, &options, 0); |
|
642
|
|
- if (irq >= 0 && irq < NR_IRQS) |
|
|
642 |
+ if (irq >= 0 && irq < nr_irqs) |
|
643
|
643 |
vrc4171_irq = irq; |
|
644
|
644 |
|
|
645
|
645 |
if (*options != ',') |
Ingo Molnar