dmaengine: idxd: Refactor remove call with idxd_cleanup() helper

commit a409e919ca321cc0e28f8abf96fde299f0072a81 upstream.

The idxd_cleanup() helper cleans up perfmon, interrupts, internals and
so on. Refactor remove call with the idxd_cleanup() helper to avoid code
duplication. Note, this also fixes the missing put_device() for idxd
groups, enginces and wqs.

Fixes: bfe1d56091c1 ("dmaengine: idxd: Init and probe for Intel data accelerators")
Cc: stable@vger.kernel.org
Suggested-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com>
Reviewed-by: Fenghua Yu <fenghuay@nvidia.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20250404120217.48772-10-xueshuai@linux.alibaba.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index fc027b1efccde2d43e7af2909341d64ef3fe8ea6..b908942fac7345cb5ff9b445337bc8a61689cfbb 100644 (file)
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -1309,7 +1309,6 @@ static void idxd_shutdown(struct pci_dev *pdev)
 static void idxd_remove(struct pci_dev *pdev)
 {
        struct idxd_device *idxd = pci_get_drvdata(pdev);
-       struct idxd_irq_entry *irq_entry;
 
        idxd_unregister_devices(idxd);
        /*
@@ -1322,21 +1321,12 @@ static void idxd_remove(struct pci_dev *pdev)
        get_device(idxd_confdev(idxd));
        device_unregister(idxd_confdev(idxd));
        idxd_shutdown(pdev);
-       if (device_pasid_enabled(idxd))
-               idxd_disable_system_pasid(idxd);
        idxd_device_remove_debugfs(idxd);
-
-       irq_entry = idxd_get_ie(idxd, 0);
-       free_irq(irq_entry->vector, irq_entry);
-       pci_free_irq_vectors(pdev);
+       idxd_cleanup(idxd);
        pci_iounmap(pdev, idxd->reg_base);
-       if (device_user_pasid_enabled(idxd))
-               idxd_disable_sva(pdev);
-       pci_disable_device(pdev);
-       destroy_workqueue(idxd->wq);
-       perfmon_pmu_remove(idxd);
        put_device(idxd_confdev(idxd));
        idxd_free(idxd);
+       pci_disable_device(pdev);
 }
 
 static struct pci_driver idxd_pci_driver = {