2020-07-18 13:27:20

by Suraj Upadhyay

[permalink] [raw]

Subject: [PATCH] staging: media: atomisp: Replace depracated MSI API.

---

Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
And as a result modify how the returned value is handled.

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

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index d36809a0182c..b824c6f78a9c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1735,8 +1735,8 @@ static int atomisp_pci_probe(struct pci_dev *dev,
pci_set_master(dev);
pci_set_drvdata(dev, isp);

- err = pci_enable_msi(dev);
- if (err) {
+ err = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI);
+ if (err < 0) {
dev_err(&dev->dev, "Failed to enable msi (%d)\n", err);
goto enable_msi_fail;
}
--
2.17.1

---

Attachments:

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

2020-07-19 04:37:28

by Suraj Upadhyay

[permalink] [raw]

Subject: Re: [PATCH] staging: media: atomisp: Replace depracated MSI API.

---

On Sat, Jul 18, 2020 at 06:56:32PM +0530, Suraj Upadhyay wrote:
> Replace depracated pci_enable_msi with pci_alloc_irq_vectors.
> And as a result modify how the returned value is handled.
>
> Signed-off-by: Suraj Upadhyay <[email protected]>
> ---
> drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Hii,
Please don't merge this patch.
It is still incomplete.
It doesn't replace pci_disable_msi.
I hope this wasn't an annoyance.

Thanks,

Suraj Upadhyay.

> diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> index d36809a0182c..b824c6f78a9c 100644
> --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> @@ -1735,8 +1735,8 @@ static int atomisp_pci_probe(struct pci_dev *dev,
> pci_set_master(dev);
> pci_set_drvdata(dev, isp);
>
> - err = pci_enable_msi(dev);
> - if (err) {
> + err = pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSI);
> + if (err < 0) {
> dev_err(&dev->dev, "Failed to enable msi (%d)\n", err);
> goto enable_msi_fail;
> }
> --
> 2.17.1
>