ptp_pch: Replace deprecated PCI functions
authorPhilipp Stanner <pstanner@redhat.com>
Mon, 28 Oct 2024 09:59:44 +0000 (10:59 +0100)
committerJakub Kicinski <kuba@kernel.org>
Fri, 1 Nov 2024 01:53:35 +0000 (18:53 -0700)
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>
Link: https://patch.msgid.link/20241028095943.20498-2-pstanner@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/ptp/ptp_pch.c

index 33355d5eb0336d601bb5a062a5635c78b6a49890..b8a9a54a176c6cef0e5e774ba57930afaa6a352f 100644 (file)
@@ -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))