Commit 09db69a8 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Bartosz Golaszewski
Browse files

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



pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
commit e354bb84 ("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: default avatarWilliam Breathitt Gray <wbg@kernel.org>
Reviewed-by: default avatarLinus 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: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent aeca1756

drivers/gpio/gpio-pcie-idio-24.c

+8 −11
Original line number Diff line number Diff line
@@ -305,19 +305,16 @@ static int idio_24_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct regmap_irq_chip_data *chip_data;



	err = pcim_enable_device(pdev);

	if (err) {

		dev_err(dev, "Failed to enable PCI device (%d)\n", err);

		return err;

	}

	if (err)

		return dev_err_probe(dev, err, "Failed to enable PCI device\n");



	err = pcim_iomap_regions(pdev, BIT(pci_plx_bar_index) | BIT(pci_bar_index), name);

	if (err) {

		dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err);

		return err;

	}

	pex8311_regs = pcim_iomap_region(pdev, pci_plx_bar_index, "pex8311");

	if (IS_ERR(pex8311_regs))

		return dev_err_probe(dev, PTR_ERR(pex8311_regs), "Unable to map PEX 8311 I/O addresses\n");



	pex8311_regs = pcim_iomap_table(pdev)[pci_plx_bar_index];

	idio_24_regs = pcim_iomap_table(pdev)[pci_bar_index];

	idio_24_regs = pcim_iomap_region(pdev, pci_bar_index, name);

	if (IS_ERR(idio_24_regs))

		return dev_err_probe(dev, PTR_ERR(idio_24_regs), "Unable to map PCIe-IDIO-24 I/O addresses\n");



	intcsr_map = devm_regmap_init_mmio(dev, pex8311_regs, &pex8311_intcsr_regmap_config);

	if (IS_ERR(intcsr_map))