| Message ID | 20240801174608.50592-8-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Remove pcim_iomap_regions_request_all() | expand |
Hi Philipp On Thu, Aug 01, 2024 at 07:46:05PM +0200, Philipp Stanner wrote: > pcim_iomap_table() and pcim_iomap_regions_request_all() have been > deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate > pcim_iomap_table(), pcim_iomap_regions_request_all()"). > > Replace these functions with their successors, pcim_iomap() and > pcim_request_all_regions() > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> Looking good to me. Thanks. Acked-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > --- > drivers/ntb/hw/idt/ntb_hw_idt.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c > index 48dfb1a69a77..f1b57d51a814 100644 > --- a/drivers/ntb/hw/idt/ntb_hw_idt.c > +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c > @@ -2671,15 +2671,20 @@ static int idt_init_pci(struct idt_ntb_dev *ndev) > */ > pci_set_master(pdev); > > - /* Request all BARs resources and map BAR0 only */ > - ret = pcim_iomap_regions_request_all(pdev, 1, NTB_NAME); > + /* Request all BARs resources */ > + ret = pcim_request_all_regions(pdev, NTB_NAME); > if (ret != 0) { > dev_err(&pdev->dev, "Failed to request resources\n"); > goto err_clear_master; > } > > - /* Retrieve virtual address of BAR0 - PCI configuration space */ > - ndev->cfgspc = pcim_iomap_table(pdev)[0]; > + /* ioremap BAR0 - PCI configuration space */ > + ndev->cfgspc = pcim_iomap(pdev, 0, 0); > + if (!ndev->cfgspc) { > + dev_err(&pdev->dev, "Failed to ioremap BAR 0\n"); > + ret = -ENOMEM; > + goto err_clear_master; > + } > > /* Put the IDT driver data pointer to the PCI-device private pointer */ > pci_set_drvdata(pdev, ndev); > -- > 2.45.2 >
diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c index 48dfb1a69a77..f1b57d51a814 100644 --- a/drivers/ntb/hw/idt/ntb_hw_idt.c +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c @@ -2671,15 +2671,20 @@ static int idt_init_pci(struct idt_ntb_dev *ndev) */ pci_set_master(pdev); - /* Request all BARs resources and map BAR0 only */ - ret = pcim_iomap_regions_request_all(pdev, 1, NTB_NAME); + /* Request all BARs resources */ + ret = pcim_request_all_regions(pdev, NTB_NAME); if (ret != 0) { dev_err(&pdev->dev, "Failed to request resources\n"); goto err_clear_master; } - /* Retrieve virtual address of BAR0 - PCI configuration space */ - ndev->cfgspc = pcim_iomap_table(pdev)[0]; + /* ioremap BAR0 - PCI configuration space */ + ndev->cfgspc = pcim_iomap(pdev, 0, 0); + if (!ndev->cfgspc) { + dev_err(&pdev->dev, "Failed to ioremap BAR 0\n"); + ret = -ENOMEM; + goto err_clear_master; + } /* Put the IDT driver data pointer to the PCI-device private pointer */ pci_set_drvdata(pdev, ndev);
pcim_iomap_table() and pcim_iomap_regions_request_all() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with their successors, pcim_iomap() and pcim_request_all_regions() Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/ntb/hw/idt/ntb_hw_idt.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)