Merge tag 'v5.9-rc4' into patchwork

[mirror_ubuntu-jammy-kernel.git] / drivers / staging / media / atomisp / pci / atomisp_v4l2.c

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 0114b040247b986abfc9babea458dd68a037db2f..376205e97a8911f7858429f4f184808f335e5071 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1429,7 +1429,6 @@ atomisp_load_firmware(struct atomisp_device *isp)
  */
 static bool is_valid_device(struct pci_dev *pdev, const struct pci_device_id *id)
 {
-       unsigned int a0_max_id = 0;
        const char *name;
        const char *product;
 
@@ -1437,11 +1436,9 @@ static bool is_valid_device(struct pci_dev *pdev, const struct pci_device_id *id
 
        switch (id->device & ATOMISP_PCI_DEVICE_SOC_MASK) {
        case ATOMISP_PCI_DEVICE_SOC_MRFLD:
-               a0_max_id = ATOMISP_PCI_REV_MRFLD_A0_MAX;
                name = "Merrifield";
                break;
        case ATOMISP_PCI_DEVICE_SOC_BYT:
-               a0_max_id = ATOMISP_PCI_REV_BYT_A0_MAX;
                name = "Baytrail";
                break;
        case ATOMISP_PCI_DEVICE_SOC_ANN:
@@ -1708,8 +1705,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 +1824,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);