2020-07-18 13:19:55

by Suraj Upadhyay

[permalink] [raw]

Subject: [PATCH] staging: rts5208: rtsx: Replace depracated MSI API

---

Replace depracated pci_enable_msi with pci_alloc_irq_vectors.

Signed-off-by: Suraj Upadhyay <[email protected]>
---
drivers/staging/rts5208/rtsx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index e28e162d004e..adc80e766412 100644
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -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;
}

--
2.17.1

---

Attachments:

(No filename) (956.00 B)
signature.asc (849.00 B)
Download all attachments

2020-07-18 15:31:30

by Suraj Upadhyay

[permalink] [raw]

Subject: Re: [PATCH] staging: rts5208: rtsx: Replace depracated MSI API

---

On Sat, Jul 18, 2020 at 06:48:56PM +0530, Suraj Upadhyay wrote:
> Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
>
> Signed-off-by: Suraj Upadhyay <[email protected]>
> ---
> drivers/staging/rts5208/rtsx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
> index e28e162d004e..adc80e766412 100644
> --- a/drivers/staging/rts5208/rtsx.c
> +++ b/drivers/staging/rts5208/rtsx.c
> @@ -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.

> 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.

> dev->chip->msi_en = 0;
> }
>
> --
> 2.17.1
>

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

Thanks,

Suraj Upadhyay