Skip to content

Commit 55285d8

Browse files
Philipp Stannerbjorn-helgaas
authored andcommitted
serial: rp2: Replace deprecated PCI functions
pcim_iomap_table() and pcim_iomap_regions_request_all() have been deprecated by the PCI subsystem in commit e354bb8 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with their successors, pcim_iomap() and pcim_request_all_regions(). Link: https://lore.kernel.org/r/20241030112743.104395-9-pstanner@redhat.com Signed-off-by: Philipp Stanner <pstanner@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
1 parent 5915997 commit 55285d8

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/tty/serial/rp2.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ static int rp2_probe(struct pci_dev *pdev,
698698
const struct firmware *fw;
699699
struct rp2_card *card;
700700
struct rp2_uart_port *ports;
701-
void __iomem * const *bars;
702701
int rc;
703702

704703
card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL);
@@ -711,13 +710,16 @@ static int rp2_probe(struct pci_dev *pdev,
711710
if (rc)
712711
return rc;
713712

714-
rc = pcim_iomap_regions_request_all(pdev, 0x03, DRV_NAME);
713+
rc = pcim_request_all_regions(pdev, DRV_NAME);
715714
if (rc)
716715
return rc;
717716

718-
bars = pcim_iomap_table(pdev);
719-
card->bar0 = bars[0];
720-
card->bar1 = bars[1];
717+
card->bar0 = pcim_iomap(pdev, 0, 0);
718+
if (!card->bar0)
719+
return -ENOMEM;
720+
card->bar1 = pcim_iomap(pdev, 1, 0);
721+
if (!card->bar1)
722+
return -ENOMEM;
721723
card->pdev = pdev;
722724

723725
rp2_decode_cap(id, &card->n_ports, &card->smpte);

0 commit comments

Comments
 (0)