mtip32xx: Remove unnecessary pcim_iounmap_regions() calls
authorPhilipp Stanner <phasta@kernel.org>
Thu, 27 Mar 2025 11:07:07 +0000 (12:07 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 9 Apr 2025 19:22:25 +0000 (14:22 -0500)
pcim_iounmap_regions() is deprecated. Moreover, it is not necessary to call
it in the driver's remove() function or if probe() fails, since it does
cleanup automatically on driver detach.

Remove all calls to pcim_iounmap_regions().

Signed-off-by: Philipp Stanner <phasta@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20250327110707.20025-3-phasta@kernel.org
drivers/block/mtip32xx/mtip32xx.c

index 0d619df03fa933686081a2f04a554f1fb25931ce..66ce6b81c7d938388aedf9b5fa69c6d10741e9ea 100644 (file)
@@ -3717,7 +3717,7 @@ static int mtip_pci_probe(struct pci_dev *pdev,
        rv = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
        if (rv) {
                dev_warn(&pdev->dev, "64-bit DMA enable failed\n");
-               goto setmask_err;
+               goto iomap_err;
        }
 
        /* Copy the info we may need later into the private data structure. */
@@ -3733,7 +3733,7 @@ static int mtip_pci_probe(struct pci_dev *pdev,
        if (!dd->isr_workq) {
                dev_warn(&pdev->dev, "Can't create wq %d\n", dd->instance);
                rv = -ENOMEM;
-               goto setmask_err;
+               goto iomap_err;
        }
 
        memset(cpu_list, 0, sizeof(cpu_list));
@@ -3830,8 +3830,6 @@ msi_initialize_err:
                drop_cpu(dd->work[1].cpu_binding);
                drop_cpu(dd->work[2].cpu_binding);
        }
-setmask_err:
-       pcim_iounmap_regions(pdev, 1 << MTIP_ABAR);
 
 iomap_err:
        kfree(dd);
@@ -3907,7 +3905,6 @@ static void mtip_pci_remove(struct pci_dev *pdev)
 
        pci_disable_msi(pdev);
 
-       pcim_iounmap_regions(pdev, 1 << MTIP_ABAR);
        pci_set_drvdata(pdev, NULL);
 
        put_disk(dd->disk);