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

gpio: pcie-idio-24: Replace deprecated PCI functions

pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()"). Replace these functions with
pcim_iomap_region().

In order to match the rest of the code in idio_24_probe(), utilize
dev_err_probe() to handle error for pcim_enable_device().

Signed-off-by: William Breathitt Gray <wbg@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20241101-pci_iomap_region_gpio_acces-v1-2-26eb1dc93e45@kernel.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

authored by

William Breathitt Gray and committed by
Bartosz Golaszewski
09db69a8 aeca1756

+8 -11
+8 -11
drivers/gpio/gpio-pcie-idio-24.c
··· 305 305 struct regmap_irq_chip_data *chip_data; 306 306 307 307 err = pcim_enable_device(pdev); 308 - if (err) { 309 - dev_err(dev, "Failed to enable PCI device (%d)\n", err); 310 - return err; 311 - } 308 + if (err) 309 + return dev_err_probe(dev, err, "Failed to enable PCI device\n"); 312 310 313 - err = pcim_iomap_regions(pdev, BIT(pci_plx_bar_index) | BIT(pci_bar_index), name); 314 - if (err) { 315 - dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err); 316 - return err; 317 - } 311 + pex8311_regs = pcim_iomap_region(pdev, pci_plx_bar_index, "pex8311"); 312 + if (IS_ERR(pex8311_regs)) 313 + return dev_err_probe(dev, PTR_ERR(pex8311_regs), "Unable to map PEX 8311 I/O addresses\n"); 318 314 319 - pex8311_regs = pcim_iomap_table(pdev)[pci_plx_bar_index]; 320 - idio_24_regs = pcim_iomap_table(pdev)[pci_bar_index]; 315 + idio_24_regs = pcim_iomap_region(pdev, pci_bar_index, name); 316 + if (IS_ERR(idio_24_regs)) 317 + return dev_err_probe(dev, PTR_ERR(idio_24_regs), "Unable to map PCIe-IDIO-24 I/O addresses\n"); 321 318 322 319 intcsr_map = devm_regmap_init_mmio(dev, pex8311_regs, &pex8311_intcsr_regmap_config); 323 320 if (IS_ERR(intcsr_map))