mtip32xx: Replace deprecated PCI functions

pcim_iomap_table() and pcim_request_regions() have been deprecated in
commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()") and commit d140f80f60358 ("PCI:
Deprecate pcim_iomap_regions() in favor of pcim_iomap_region()"),
respectively.

Replace these functions with pcim_iomap_region().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Link: https://lore.kernel.org/r/20241106145249.108996-2-pstanner@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 223faa9d5ffdae9ab12980cd16b627119502c1ff..43701b7b10a7be47d7d2f9dbef7b47fe7dd68713 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2701,7 +2701,12 @@ static int mtip_hw_init(struct driver_data *dd)
        int rv;
        unsigned long timeout, timetaken;
 
-       dd->mmio = pcim_iomap_table(dd->pdev)[MTIP_ABAR];
+       dd->mmio = pcim_iomap_region(dd->pdev, MTIP_ABAR, MTIP_DRV_NAME);
+       if (IS_ERR(dd->mmio)) {
+               dev_err(&dd->pdev->dev, "Unable to request / ioremap PCI region\n");
+               return PTR_ERR(dd->mmio);
+       }
+
 
        mtip_detect_product(dd);
        if (dd->product_type == MTIP_PRODUCT_UNKNOWN) {
@@ -3710,13 +3715,6 @@ static int mtip_pci_probe(struct pci_dev *pdev,
                goto iomap_err;
        }
 
-       /* Map BAR5 to memory. */
-       rv = pcim_iomap_regions(pdev, 1 << MTIP_ABAR, MTIP_DRV_NAME);
-       if (rv < 0) {
-               dev_err(&pdev->dev, "Unable to map regions\n");
-               goto iomap_err;
-       }
-
        rv = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
        if (rv) {
                dev_warn(&pdev->dev, "64-bit DMA enable failed\n");