Commit ecc57efe authored by Gustavo Pimentel's avatar Gustavo Pimentel Committed by Lorenzo Pieralisi

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: default avatarAlan Douglas <adouglas@cadence.com>
Signed-off-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
[lorenzo.pieralisi@arm.com: updated commit log]
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 798c0441
...@@ -203,7 +203,7 @@ static bool pci_endpoint_test_msi_irq(struct pci_endpoint_test *test, ...@@ -203,7 +203,7 @@ static bool pci_endpoint_test_msi_irq(struct pci_endpoint_test *test,
if (!val) if (!val)
return false; return false;
if (test->last_irq - pdev->irq == msi_num - 1) if (pci_irq_vector(pdev, msi_num - 1) == test->last_irq)
return true; return true;
return false; return false;
...@@ -525,12 +525,12 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, ...@@ -525,12 +525,12 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
} }
for (i = 1; i < irq; i++) { for (i = 1; i < irq; i++) {
err = devm_request_irq(dev, pdev->irq + i, err = devm_request_irq(dev, pci_irq_vector(pdev, i),
pci_endpoint_test_irqhandler, pci_endpoint_test_irqhandler,
IRQF_SHARED, DRV_MODULE_NAME, test); IRQF_SHARED, DRV_MODULE_NAME, test);
if (err) if (err)
dev_err(dev, "failed to request IRQ %d for MSI %d\n", dev_err(dev, "failed to request IRQ %d for MSI %d\n",
pdev->irq + i, i + 1); pci_irq_vector(pdev, i), i + 1);
} }
for (bar = BAR_0; bar <= BAR_5; bar++) { for (bar = BAR_0; bar <= BAR_5; bar++) {
...@@ -592,7 +592,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev, ...@@ -592,7 +592,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
} }
for (i = 0; i < irq; i++) for (i = 0; i < irq; i++)
devm_free_irq(dev, pdev->irq + i, test); devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i), test);
err_disable_msi: err_disable_msi:
pci_disable_msi(pdev); pci_disable_msi(pdev);
...@@ -625,7 +625,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev) ...@@ -625,7 +625,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
pci_iounmap(pdev, test->bar[bar]); pci_iounmap(pdev, test->bar[bar]);
} }
for (i = 0; i < test->num_irqs; i++) for (i = 0; i < test->num_irqs; i++)
devm_free_irq(&pdev->dev, pdev->irq + i, test); devm_free_irq(&pdev->dev, pci_irq_vector(pdev, i), test);
pci_disable_msi(pdev); pci_disable_msi(pdev);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment