diff options
| author | Suraj Upadhyay <usuraj35@gmail.com> | 2020-07-19 16:26:23 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-09-03 10:59:55 +0200 |
| commit | 02900a49a43b7f634cb457b94658b6efbc91b877 (patch) | |
| tree | 8003cd036061096a84533db5cea58847aedd75ef /drivers/staging/media/atomisp | |
| parent | ed99640d558ac4011c2b4abc26138027203ccfe2 (diff) | |
| download | linux-stable-02900a49a43b7f634cb457b94658b6efbc91b877.tar.gz linux-stable-02900a49a43b7f634cb457b94658b6efbc91b877.tar.bz2 linux-stable-02900a49a43b7f634cb457b94658b6efbc91b877.zip | |
media: atomisp: Replace deprecated MSI APIs
Replace deprecated MSI IRQ enabler and disabler
with pci_alloc_irq_vectors and pci_free_irq_vectors respectively.
And as a result handle the returned error as appropriate.
Compile tested.
[mchehab: solved a merge conflict that renamed dev->pdev]
Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/atomisp')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c index a000a1e316f7..8c1d5a3b8f45 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -1708,8 +1708,8 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i pci_set_master(pdev); - err = pci_enable_msi(pdev); - if (err) { + err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSI); + if (err < 0) { dev_err(&pdev->dev, "Failed to enable msi (%d)\n", err); goto enable_msi_fail; } @@ -1827,7 +1827,7 @@ register_entities_fail: initialize_modules_fail: cpu_latency_qos_remove_request(&isp->pm_qos); atomisp_msi_irq_uninit(isp); - pci_disable_msi(pdev); + pci_free_irq_vectors(pdev); enable_msi_fail: fw_validation_fail: release_firmware(isp->firmware); |