| Message ID | 20241028095943.20498-2-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9c5649c17737c430537878a6bd97399555f7a920 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ptp_pch: Replace deprecated PCI functions | expand |
On Mon, 28 Oct 2024 10:59:44 +0100 Philipp Stanner wrote: > Additionally, pass KBUILD_MODNAME to that function, since the 'name' > parameter should indicate who (i.e., which driver) has requested the > resource. Not sure if anyone cares but in theory this could break something. Let's find out..
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 28 Oct 2024 10:59:44 +0100 you wrote: > pcim_iomap_regions() and pcim_iomap_table() have been deprecated in > commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), > pcim_iomap_regions_request_all()"). > > Replace these functions with pcim_iomap_region(). > > Additionally, pass KBUILD_MODNAME to that function, since the 'name' > parameter should indicate who (i.e., which driver) has requested the > resource. > > [...] Here is the summary with links: - ptp_pch: Replace deprecated PCI functions https://git.kernel.org/netdev/net-next/c/9c5649c17737 You are awesome, thank you!
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c index 33355d5eb033..b8a9a54a176c 100644 --- a/drivers/ptp/ptp_pch.c +++ b/drivers/ptp/ptp_pch.c @@ -462,14 +462,14 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id) return ret; } - ret = pcim_iomap_regions(pdev, BIT(IO_MEM_BAR), "1588_regs"); + /* get the virtual address to the 1588 registers */ + chip->regs = pcim_iomap_region(pdev, IO_MEM_BAR, KBUILD_MODNAME); + ret = PTR_ERR_OR_ZERO(chip->regs); if (ret) { dev_err(&pdev->dev, "could not locate IO memory address\n"); return ret; } - /* get the virtual address to the 1588 registers */ - chip->regs = pcim_iomap_table(pdev)[IO_MEM_BAR]; chip->caps = ptp_pch_caps; chip->ptp_clock = ptp_clock_register(&chip->caps, &pdev->dev); if (IS_ERR(chip->ptp_clock))
pcim_iomap_regions() and pcim_iomap_table() have been deprecated in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with pcim_iomap_region(). Additionally, pass KBUILD_MODNAME to that function, since the 'name' parameter should indicate who (i.e., which driver) has requested the resource. Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/ptp/ptp_pch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)