tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Philipp Stanner and committed by
Mark Brown a992197b 1d434781

+9 -13
+4 -5
drivers/spi/spi-dw-pci.c
··· 98 98 dws->paddr = pci_resource_start(pdev, pci_bar); 99 99 pci_set_master(pdev); 100 100 101 - ret = pcim_iomap_regions(pdev, 1 << pci_bar, pci_name(pdev)); 102 - if (ret) 103 - return ret; 104 - 105 101 ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); 106 102 if (ret < 0) 107 103 return ret; 108 104 109 - dws->regs = pcim_iomap_table(pdev)[pci_bar]; 105 + dws->regs = pcim_iomap_region(pdev, pci_bar, pci_name(pdev)); 106 + if (IS_ERR(dws->regs)) 107 + return PTR_ERR(dws->regs); 108 + 110 109 dws->irq = pci_irq_vector(pdev, 0); 111 110 112 111 /*
+2 -3
drivers/spi/spi-loongson-pci.c
··· 19 19 if (ret < 0) 20 20 return dev_err_probe(dev, ret, "cannot enable pci device\n"); 21 21 22 - ret = pcim_iomap_regions(pdev, BIT(pci_bar), pci_name(pdev)); 22 + reg_base = pcim_iomap_region(pdev, pci_bar, pci_name(pdev)); 23 + ret = PTR_ERR_OR_ZERO(reg_base); 23 24 if (ret) 24 25 return dev_err_probe(dev, ret, "failed to request and remap memory\n"); 25 - 26 - reg_base = pcim_iomap_table(pdev)[pci_bar]; 27 26 28 27 ret = loongson_spi_init_controller(dev, reg_base); 29 28 if (ret)
+3 -5
drivers/spi/spi-pxa2xx-pci.c
··· 273 273 if (ret) 274 274 return ret; 275 275 276 - ret = pcim_iomap_regions(dev, 1 << 0, "PXA2xx SPI"); 277 - if (ret) 278 - return ret; 279 - 280 276 pdata = devm_kzalloc(&dev->dev, sizeof(*pdata), GFP_KERNEL); 281 277 if (!pdata) 282 278 return -ENOMEM; ··· 280 284 ssp = &pdata->ssp; 281 285 ssp->dev = &dev->dev; 282 286 ssp->phys_base = pci_resource_start(dev, 0); 283 - ssp->mmio_base = pcim_iomap_table(dev)[0]; 287 + ssp->mmio_base = pcim_iomap_region(dev, 0, "PXA2xx SPI"); 288 + if (IS_ERR(ssp->mmio_base)) 289 + return PTR_ERR(ssp->mmio_base); 284 290 285 291 info = (struct pxa_spi_info *)ent->driver_data; 286 292 ret = info->setup(dev, pdata);