Commit ebf7547f authored by Philipp Stanner's avatar Philipp Stanner Committed by Bjorn Helgaas
Browse files

mtip32xx: Remove unnecessary pcim_iounmap_regions() calls 



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: default avatarPhilipp Stanner <phasta@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJens Axboe <axboe@kernel.dk>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/20250327110707.20025-3-phasta@kernel.org
parent 0af2f6be

drivers/block/mtip32xx/mtip32xx.c

+2 −5
Original line number Diff line number Diff line
@@ -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 @@ static int mtip_pci_probe(struct pci_dev *pdev, 
		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);