mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpio: pci-idio-16: Replace deprecated PCI functions

Browse Source 
pcim_iomap_regions() and pcim_iomap_table() have been deprecated in
commit e354bb84a4 ("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 <wbg@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20241101-pci_iomap_region_gpio_acces-v1-1-26eb1dc93e45@kernel.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
William Breathitt Gray 2024-11-01 16:15:08 +09:00 committed by Bartosz Golaszewski
parent dae01ec714
commit aeca17561d
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpio/gpio-pci-idio-16.c
View File

@ -70,24 +70,17 @@ static int idio_16_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct device *const dev = &pdev->dev; struct device *const dev = &pdev->dev;
int err; int err;
const size_t pci_bar_index = 2; const size_t pci_bar_index = 2;
const char *const name = pci_name(pdev);
struct idio_16_regmap_config config = {}; struct idio_16_regmap_config config = {};
void __iomem *regs; void __iomem *regs;
struct regmap *map; struct regmap *map;
err = pcim_enable_device(pdev); err = pcim_enable_device(pdev);
if (err) { if (err)
dev_err(dev, "Failed to enable PCI device (%d)\n", err); return dev_err_probe(dev, err, "Failed to enable PCI device\n");
return err;
}
err = pcim_iomap_regions(pdev, BIT(pci_bar_index), name); regs = pcim_iomap_region(pdev, pci_bar_index, pci_name(pdev));
if (err) { if (IS_ERR(regs))
dev_err(dev, "Unable to map PCI I/O addresses (%d)\n", err); return dev_err_probe(dev, PTR_ERR(regs), "Unable to map PCI I/O addresses\n");
return err;
}
regs = pcim_iomap_table(pdev)[pci_bar_index];
map = devm_regmap_init_mmio(dev, regs, &idio_16_regmap_config); map = devm_regmap_init_mmio(dev, regs, &idio_16_regmap_config);
if (IS_ERR(map)) if (IS_ERR(map))