| Message ID | 20240801174608.50592-9-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Remove pcim_iomap_regions_request_all() | expand |
On 01. 08. 24, 19:46, 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() Reviewed-by: Jiri Slaby <jirislaby@kernel.org> > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > --- > drivers/tty/serial/rp2.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) thanks,
On Fri, 2024-08-02 at 07:18 +0200, Jiri Slaby wrote: > On 01. 08. 24, 19:46, 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() > > Reviewed-by: Jiri Slaby <jirislaby@kernel.org> Thank you for the review. I have to provide a v2 for a small bug in one of the other patches. While I'm at it, I would rename the title of this patch №8 here so that it's "Replace" instead of "Remove", making it consistent with the other ones. I'd assume that keeping your RB then would be alright. Please tell me if not. Cheers, P. > > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > > --- > > drivers/tty/serial/rp2.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > thanks,
diff --git a/drivers/tty/serial/rp2.c b/drivers/tty/serial/rp2.c index 4132fcff7d4e..b6b30bb956fa 100644 --- a/drivers/tty/serial/rp2.c +++ b/drivers/tty/serial/rp2.c @@ -698,7 +698,6 @@ static int rp2_probe(struct pci_dev *pdev, const struct firmware *fw; struct rp2_card *card; struct rp2_uart_port *ports; - void __iomem * const *bars; int rc; card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL); @@ -711,13 +710,16 @@ static int rp2_probe(struct pci_dev *pdev, if (rc) return rc; - rc = pcim_iomap_regions_request_all(pdev, 0x03, DRV_NAME); + rc = pcim_request_all_regions(pdev, DRV_NAME); if (rc) return rc; - bars = pcim_iomap_table(pdev); - card->bar0 = bars[0]; - card->bar1 = bars[1]; + card->bar0 = pcim_iomap(pdev, 0, 0); + if (!card->bar0) + return -ENOMEM; + card->bar1 = pcim_iomap(pdev, 1, 0); + if (!card->bar1) + return -ENOMEM; card->pdev = pdev; rp2_decode_cap(id, &card->n_ports, &card->smpte);
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/tty/serial/rp2.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)