Skip to content

Commit

Permalink
firewire: ohci: Replace deprecated PCI functions
Browse files Browse the repository at this point in the history
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().

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Link: https://lore.kernel.org/r/20241028094440.19115-3-pstanner@redhat.com
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
  • Loading branch information
Philipp Stanner authored and Takashi Sakamoto committed Oct 28, 2024
1 parent 8f04019 commit b7688fc
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/firewire/ohci.c
Original file line number Diff line number Diff line change
Expand Up @@ -3726,12 +3726,11 @@ static int pci_probe(struct pci_dev *dev,
return -ENXIO;
}

err = pcim_iomap_regions(dev, 1 << 0, ohci_driver_name);
if (err) {
ohci->registers = pcim_iomap_region(dev, 0, ohci_driver_name);
if (IS_ERR(ohci->registers)) {
ohci_err(ohci, "request and map MMIO resource unavailable\n");
return -ENXIO;
}
ohci->registers = pcim_iomap_table(dev)[0];

for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)
if ((ohci_quirks[i].vendor == dev->vendor) &&
Expand Down

0 comments on commit b7688fc

Please sign in to comment.