spi: 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()").

Replace these functions with pcim_iomap_region().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Link: https://patch.msgid.link/20241024140426.157444-2-pstanner@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index 7c8279d..6b8cc26 100644 (file)
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -98,15 +98,14 @@ static int dw_spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en
        dws->paddr = pci_resource_start(pdev, pci_bar);
        pci_set_master(pdev);
 
-       ret = pcim_iomap_regions(pdev, 1 << pci_bar, pci_name(pdev));
-       if (ret)
-               return ret;
-
        ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
        if (ret < 0)
                return ret;
 
-       dws->regs = pcim_iomap_table(pdev)[pci_bar];
+       dws->regs = pcim_iomap_region(pdev, pci_bar, pci_name(pdev));
+       if (IS_ERR(dws->regs))
+               return PTR_ERR(dws->regs);
+
        dws->irq = pci_irq_vector(pdev, 0);
 
        /*

diff --git a/drivers/spi/spi-loongson-pci.c b/drivers/spi/spi-loongson-pci.c
index 134cda0..892cf1e 100644 (file)
--- a/drivers/spi/spi-loongson-pci.c
+++ b/drivers/spi/spi-loongson-pci.c
@@ -19,12 +19,11 @@ static int loongson_spi_pci_register(struct pci_dev *pdev,
        if (ret < 0)
                return dev_err_probe(dev, ret, "cannot enable pci device\n");
 
-       ret = pcim_iomap_regions(pdev, BIT(pci_bar), pci_name(pdev));
+       reg_base = pcim_iomap_region(pdev, pci_bar, pci_name(pdev));
+       ret = PTR_ERR_OR_ZERO(reg_base);
        if (ret)
                return dev_err_probe(dev, ret, "failed to request and remap memory\n");
 
-       reg_base = pcim_iomap_table(pdev)[pci_bar];
-
        ret = loongson_spi_init_controller(dev, reg_base);
        if (ret)
                return dev_err_probe(dev, ret, "failed to initialize controller\n");

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index cc8dcf7..e51c1b4 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -273,10 +273,6 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
        if (ret)
                return ret;
 
-       ret = pcim_iomap_regions(dev, 1 << 0, "PXA2xx SPI");
-       if (ret)
-               return ret;
-
        pdata = devm_kzalloc(&dev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
                return -ENOMEM;
@@ -284,7 +280,9 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
        ssp = &pdata->ssp;
        ssp->dev = &dev->dev;
        ssp->phys_base = pci_resource_start(dev, 0);
-       ssp->mmio_base = pcim_iomap_table(dev)[0];
+       ssp->mmio_base = pcim_iomap_region(dev, 0, "PXA2xx SPI");
+       if (IS_ERR(ssp->mmio_base))
+               return PTR_ERR(ssp->mmio_base);
 
        info = (struct pxa_spi_info *)ent->driver_data;
        ret = info->setup(dev, pdata);