From 604f7e7777d663033063886b6a5362d0e6092e3a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Winiarski?= Date: Wed, 29 Nov 2023 22:44:59 +0100 Subject: [PATCH] drm/xe/irq: Don't call pci_free_irq_vectors MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For devres managed devices, pci_alloc_irq_vectors is also managed (see pci_setup_msi_context for reference). PCI device used by Xe is devres managed (it was enabled with pcim_enable_device), which means that calls to pci_free_irq_vectors are redundant and can be safely removed. Signed-off-by: Michał Winiarski Reviewed-by: Matt Roper Link: https://lore.kernel.org/r/20231129214509.1174116-4-michal.winiarski@intel.com Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_irq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c index 25ba5167c1b92..d1f5ba4bb745a 100644 --- a/drivers/gpu/drm/xe/xe_irq.c +++ b/drivers/gpu/drm/xe/xe_irq.c @@ -585,7 +585,6 @@ static void irq_uninstall(struct drm_device *drm, void *arg) irq = pci_irq_vector(pdev, 0); free_irq(irq, xe); - pci_free_irq_vectors(pdev); } int xe_irq_install(struct xe_device *xe) @@ -612,7 +611,7 @@ int xe_irq_install(struct xe_device *xe) err = request_irq(irq, irq_handler, IRQF_SHARED, DRIVER_NAME, xe); if (err < 0) { drm_err(&xe->drm, "Failed to request MSI/MSIX IRQ %d\n", err); - goto free_pci_irq_vectors; + return err; } xe->irq.enabled = true; @@ -627,8 +626,6 @@ int xe_irq_install(struct xe_device *xe) free_irq_handler: free_irq(irq, xe); -free_pci_irq_vectors: - pci_free_irq_vectors(pdev); return err; } -- 2.30.2