Skip to content

Commit aeca175

Browse files
William Breathitt GrayBartosz Golaszewski
authored andcommitted
gpio: pci-idio-16: Replace deprecated PCI functions
pcim_iomap_regions() and pcim_iomap_table() have been deprecated in commit e354bb8 ("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_16_probe(), utilize dev_err_probe() to handle error for pcim_enable_device(). Signed-off-by: William Breathitt Gray <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Link: https://lore.kernel.org/r/20241101-pci_iomap_region_gpio_acces-v1-1-26eb1dc93e45@kernel.org Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent dae01ec commit aeca175

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

drivers/gpio/gpio-pci-idio-16.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,17 @@ static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id *id)
7070
struct device *const dev = &pdev->dev;
7171
int err;
7272
const size_t pci_bar_index = 2;
73-
const char *const name = pci_name(pdev);
7473
struct idio_16_regmap_config config = {};
7574
void __iomem *regs;
7675
struct regmap *map;
7776

7877
err = pcim_enable_device(pdev);
79-
if (err) {
80-
dev_err(dev, "Failed to enable PCI device (%d)\n", err);
81-
return err;
82-
}
83-
84-
err = pcim_iomap_regions(pdev, BIT(pci_bar_index), name);
85-
if (err) {
86-
dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err);
87-
return err;
88-
}
78+
if (err)
79+
return dev_err_probe(dev, err, "Failed to enable PCI device\n");
8980

90-
regs = pcim_iomap_table(pdev)[pci_bar_index];
81+
regs = pcim_iomap_region(pdev, pci_bar_index, pci_name(pdev));
82+
if (IS_ERR(regs))
83+
return dev_err_probe(dev, PTR_ERR(regs), "Unable to map PCI I/O addresses\n");
9184

9285
map = devm_regmap_init_mmio(dev, regs, &idio_16_regmap_config);
9386
if (IS_ERR(map))

0 commit comments

Comments
 (0)