Commit 64fe9bc3 authored by Philipp Stanner's avatar Philipp Stanner Committed by Bjorn Helgaas
Browse files

ethernet: cavium: Replace deprecated PCI functions 

pcim_iomap_regions() and pcim_iomap_table() have been deprecated by
the PCI subsystem in commit e354bb84 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()").

Replace the deprecated PCI functions with their successors.

Link: https://lore.kernel.org/r/20241016094911.24818-8-pstanner@redhat.com


Signed-off-by: default avatarPhilipp Stanner <pstanner@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 49966567

drivers/net/ethernet/cavium/common/cavium_ptp.c

+3 −4
Original line number Diff line number Diff line
@@ -239,12 +239,11 @@ static int cavium_ptp_probe(struct pci_dev *pdev, 
	if (err)

		goto error_free;



	err = pcim_iomap_regions(pdev, 1 << PCI_PTP_BAR_NO, pci_name(pdev));

	clock->reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO, pci_name(pdev));

	err = PTR_ERR_OR_ZERO(clock->reg_base);

	if (err)

		goto error_free;



	clock->reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO];



	spin_lock_init(&clock->spin_lock);



	cc = &clock->cycle_counter;
@@ -292,7 +291,7 @@ static int cavium_ptp_probe(struct pci_dev *pdev, 
	clock_cfg = readq(clock->reg_base + PTP_CLOCK_CFG);

	clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN;

	writeq(clock_cfg, clock->reg_base + PTP_CLOCK_CFG);

	pcim_iounmap_regions(pdev, 1 << PCI_PTP_BAR_NO);

	pcim_iounmap_region(pdev, PCI_PTP_BAR_NO);



error_free:

	devm_kfree(dev, clock);