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

fpga/dfl-pci.c: 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()").

Port dfl-pci.c to the successor, pcim_iomap_region().

Consistently, replace pcim_iounmap_regions() with pcim_iounmap_region().

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


Signed-off-by: default avatarPhilipp Stanner <pstanner@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Acked-by: default avatarXu Yilun <yilun.xu@intel.com>
parent 083b0ac4

drivers/fpga/dfl-pci.c

+4 −12
Original line number Diff line number Diff line
@@ -39,14 +39,6 @@ struct cci_drvdata { 
	struct dfl_fpga_cdev *cdev;	/* container device */

};



static void __iomem *cci_pci_ioremap_bar0(struct pci_dev *pcidev)

{

	if (pcim_iomap_regions(pcidev, BIT(0), DRV_NAME))

		return NULL;



	return pcim_iomap_table(pcidev)[0];

}



static int cci_pci_alloc_irq(struct pci_dev *pcidev)

{

	int ret, nvec = pci_msix_vec_count(pcidev);
@@ -235,9 +227,9 @@ static int find_dfls_by_default(struct pci_dev *pcidev, 
	u64 v;



	/* start to find Device Feature List from Bar 0 */

	base = cci_pci_ioremap_bar0(pcidev);

	if (!base)

		return -ENOMEM;

	base = pcim_iomap_region(pcidev, 0, DRV_NAME);

	if (IS_ERR(base))

		return PTR_ERR(base);



	/*

	 * PF device has FME and Ports/AFUs, and VF device only has one
@@ -296,7 +288,7 @@ static int find_dfls_by_default(struct pci_dev *pcidev, 
	}



	/* release I/O mappings for next step enumeration */

	pcim_iounmap_regions(pcidev, BIT(0));

	pcim_iounmap_region(pcidev, 0);



	return ret;

}