Skip to contentSkip to conversation

staging: kpc2000: Replace depracated MSI APIs

PATCH In review Suraj Upadhyay 2 participants 2 messages Jul 19, 2020 – Jul 20, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 staging: kpc2000: Replace depracated MSI APIs

Replace depracated MSI IRQ enabler and disabler
with pci_alloc_irq_vectors and pci_free_irq_vectors respectively. Compile tested.

---
Changes:
v3: Replaced the disabler for MSI IRQ too with
pci_free_irq_vectors.
v2: Fix the undefined variable error.

---
 drivers/staging/kpc2000/kpc2000/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/kpc2000/kpc2000/core.c +2 -2
index 358d7b2f4ad1..952ae8d11f9d 100644
@@ -440,7 +440,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev,
 	dev_dbg(&pcard->pdev->dev,
 		"Using DMA mask %0llx\n", dma_get_mask(PCARD_TO_DEV(pcard)));
 
-	err = pci_enable_msi(pcard->pdev);
+	err = pci_alloc_irq_vectors(pcard->pdev, 1, 1, PCI_IRQ_MSI);
 	if (err < 0)
 		goto err_release_dma;
 
@@ -474,7 +474,7 @@ static int kp2000_pcie_probe(struct pci_dev *pdev,
 err_free_irq:
 	free_irq(pcard->pdev->irq, pcard);
 err_disable_msi:
-	pci_disable_msi(pcard->pdev);
+	pci_free_irq_vectors(pcard->pdev);
 err_release_dma:
 	pci_release_region(pdev, DMA_BAR);
 err_unmap_dma:
Signature · 1 line
2.17.1
#1 lore raw
Quoted 9 lines · Suraj Upadhyay

Replace depracated MSI IRQ enabler and disabler
with pci_alloc_irq_vectors and pci_free_irq_vectors respectively. Compile tested.

---
Changes:
v3: Replaced the disabler for MSI IRQ too with
pci_free_irq_vectors.

No, this still has bugs. Grep the file for msi and update everything and update the comments and label names as well.

Can you just slow down a bit and fix one driver correctly before trying to fix a bunch of drivers?

regards,
dan carpenter