media: ipu3-cio2: Replace deprecated PCI functions

pcim_iomap_table() and pcim_iomap_regions() have been deprecated.

Replace them with pcim_iomap_region(), and pass the actual driver name
to that function.

Signed-off-by: Philipp Stanner <phasta@kernel.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index 0c365eb59085f4cb4763963dfe1055c1d5cad62e..16fde96c9fb2e20749ec918b6c989e578c3cf8f6 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1702,14 +1702,13 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
        dev_info(dev, "device 0x%x (rev: 0x%x)\n",
                 pci_dev->device, pci_dev->revision);
 
-       r = pcim_iomap_regions(pci_dev, 1 << CIO2_PCI_BAR, pci_name(pci_dev));
+       cio2->base = pcim_iomap_region(pci_dev, CIO2_PCI_BAR, CIO2_NAME);
+       r = PTR_ERR_OR_ZERO(cio2->base);
        if (r) {
                dev_err(dev, "failed to remap I/O memory (%d)\n", r);
                return -ENODEV;
        }
 
-       cio2->base = pcim_iomap_table(pci_dev)[CIO2_PCI_BAR];
-
        pci_set_drvdata(pci_dev, cio2);
 
        pci_set_master(pci_dev);