]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
spi: dw-pci: remove redundant pci_free_irq_vectors() calls
authorFelix Gu <ustc.gu@gmail.com>
Fri, 29 May 2026 18:54:31 +0000 (02:54 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 8 Jun 2026 18:04:40 +0000 (19:04 +0100)
The driver uses pcim_enable_device(), so IRQ vectors are automatically
freed by devres on driver detach. The explicit pci_free_irq_vectors()
calls in the probe error path and remove function are redundant.

Drop them and the now-unused error label.

Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Link: https://patch.msgid.link/20260530-dw-pci-v1-1-5d2cf798b3c3@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-dw-pci.c

index 7f002d5e5b8817cc3a6f5237e25ef3e61bd730ed..bfb874f96a26e1d5211dc3738aa4bdf6e19c16bf 100644 (file)
@@ -120,16 +120,15 @@ static int dw_spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
                if (desc->setup) {
                        ret = desc->setup(dws);
                        if (ret)
-                               goto err_free_irq_vectors;
+                               return ret;
                }
        } else {
-               ret = -ENODEV;
-               goto err_free_irq_vectors;
+               return -ENODEV;
        }
 
        ret = dw_spi_add_controller(&pdev->dev, dws);
        if (ret)
-               goto err_free_irq_vectors;
+               return ret;
 
        /* PCI hook and SPI hook use the same drv data */
        pci_set_drvdata(pdev, dws);
@@ -143,10 +142,6 @@ static int dw_spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
        pm_runtime_allow(&pdev->dev);
 
        return 0;
-
-err_free_irq_vectors:
-       pci_free_irq_vectors(pdev);
-       return ret;
 }
 
 static void dw_spi_pci_remove(struct pci_dev *pdev)
@@ -157,7 +152,6 @@ static void dw_spi_pci_remove(struct pci_dev *pdev)
        pm_runtime_get_noresume(&pdev->dev);
 
        dw_spi_remove_controller(dws);
-       pci_free_irq_vectors(pdev);
 }
 
 #ifdef CONFIG_PM_SLEEP