Skip to content

Commit ecc57ef

Browse files
gustavoSNPSLorenzo Pieralisi
authored andcommitted
misc: pci_endpoint_test: Use pci_irq_vector function
Replace "pdev->irq + index" operation by the pci_irq_vector() call, that converts from device vector to Linux IRQ. Suggested-by: Alan Douglas <adouglas@cadence.com> Signed-off-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> [lorenzo.pieralisi@arm.com: updated commit log] Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
1 parent 798c044 commit ecc57ef

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/misc/pci_endpoint_test.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static bool pci_endpoint_test_msi_irq(struct pci_endpoint_test *test,
203203
if (!val)
204204
return false;
205205

206-
if (test->last_irq - pdev->irq == msi_num - 1)
206+
if (pci_irq_vector(pdev, msi_num - 1) == test->last_irq)
207207
return true;
208208

209209
return false;
@@ -525,12 +525,12 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
525525
}
526526

527527
for (i = 1; i < irq; i++) {
528-
err = devm_request_irq(dev, pdev->irq + i,
528+
err = devm_request_irq(dev, pci_irq_vector(pdev, i),
529529
pci_endpoint_test_irqhandler,
530530
IRQF_SHARED, DRV_MODULE_NAME, test);
531531
if (err)
532532
dev_err(dev, "failed to request IRQ %d for MSI %d\n",
533-
pdev->irq + i, i + 1);
533+
pci_irq_vector(pdev, i), i + 1);
534534
}
535535

536536
for (bar = BAR_0; bar <= BAR_5; bar++) {
@@ -592,7 +592,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
592592
}
593593

594594
for (i = 0; i < irq; i++)
595-
devm_free_irq(dev, pdev->irq + i, test);
595+
devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i), test);
596596

597597
err_disable_msi:
598598
pci_disable_msi(pdev);
@@ -625,7 +625,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
625625
pci_iounmap(pdev, test->bar[bar]);
626626
}
627627
for (i = 0; i < test->num_irqs; i++)
628-
devm_free_irq(&pdev->dev, pdev->irq + i, test);
628+
devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i), test);
629629
pci_disable_msi(pdev);
630630
pci_release_regions(pdev);
631631
pci_disable_device(pdev);

0 commit comments

Comments
 (0)