Skip to contentSkip to conversation

staging: rts5208: rtsx: Replace depracated MSI API

PATCH In review Suraj Upadhyay 1 participant 2 messages Jul 18, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rts5208: rtsx: Replace depracated MSI API

Replace depracated pci_enable_msi with pci_alloc_irq_vectors.

---
 drivers/staging/rts5208/rtsx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx.c +2 -2
index e28e162d004e..adc80e766412 100644
@@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
 	pci_set_master(pci);
 
 	if (chip->msi_en) {
-		if (pci_enable_msi(pci) < 0)
+		if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI) < 0)
 			chip->msi_en = 0;
 	}
 
@@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
 	dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
 
 	if (dev->chip->msi_en) {
-		if (pci_enable_msi(pci) < 0)
+		if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI) < 0)
 			dev->chip->msi_en = 0;
 	}
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 12 lines · Suraj Upadhyay

Replace depracated pci_enable_msi with pci_alloc_irq_vectors.

---
 drivers/staging/rts5208/rtsx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rts5208/rtsx.c +0 -0
index e28e162d004e..adc80e766412 100644

drivers/staging/rts5208/rtsx.c static int __maybe_unused rtsx_resume(struct device *dev_d) · line 313

Quoted 5 lines
drivers/staging/rts5208/rtsx.c +1 -1
@@ -310,7 +310,7 @@ static int __maybe_unused rtsx_resume(struct device *dev_d)
 	pci_set_master(pci);
 
 	if (chip->msi_en) {
-		if (pci_enable_msi(pci) < 0)
+		if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI) < 0)

The conversion is buggy, It changes variable name.

drivers/staging/rts5208/rtsx.c static int rtsx_probe(struct pci_dev *pci, · line 884

Quoted 9 lines
drivers/staging/rts5208/rtsx.c +1 -1
 			chip->msi_en = 0;
 	}
 
@@ -881,7 +881,7 @@ static int rtsx_probe(struct pci_dev *pci,
 	dev_info(&pci->dev, "pci->irq = %d\n", pci->irq);
 
 	if (dev->chip->msi_en) {
-		if (pci_enable_msi(pci) < 0)
+		if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI) < 0)

This has the same mistake.

Quoted 6 lines
drivers/staging/rts5208/rtsx.c +0 -0
 			dev->chip->msi_en = 0;
 	}
 
Signature · 1 line
2.17.1

Resending this patch.
I hope this wasn't an annoyance.

Thanks,

Suraj Upadhyay