Commit 90f1b42b authored by Philipp Stanner's avatar Philipp Stanner Committed by Borislav Petkov (AMD)
Browse files

x86/platform/intel-mid: Replace deprecated PCI functions 



pcim_iomap_table() and pcim_request_regions() have been deprecated in

  e354bb84 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()") and
  d140f80f ("PCI: Deprecate pcim_iomap_regions() in favor of pcim_iomap_region()"),

respectively.

Replace these functions with pcim_iomap_region().

Additionally, pass the actual driver name to pcim_iomap_region() instead of
the previous pci_name(), since the @name parameter should always reflect which
driver owns a region.

Signed-off-by: default avatarPhilipp Stanner <pstanner@redhat.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20241111103602.16615-2-pstanner@redhat.com
parent 2d5404ca

arch/x86/platform/intel-mid/pwr.c

+7 −7
Original line number Diff line number Diff line
@@ -358,18 +358,18 @@ static int mid_pwr_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return ret;

	}



	ret = pcim_iomap_regions(pdev, 1 << 0, pci_name(pdev));

	if (ret) {

		dev_err(&pdev->dev, "I/O memory remapping failed\n");

		return ret;

	}



	pwr = devm_kzalloc(dev, sizeof(*pwr), GFP_KERNEL);

	if (!pwr)

		return -ENOMEM;



	pwr->regs = pcim_iomap_region(pdev, 0, "intel_mid_pwr");

	ret = PTR_ERR_OR_ZERO(pwr->regs);

	if (ret) {

		dev_err(&pdev->dev, "Could not request / ioremap I/O-Mem: %d\n", ret);

		return ret;

	}



	pwr->dev = dev;

	pwr->regs = pcim_iomap_table(pdev)[0];

	pwr->irq = pdev->irq;



	mutex_init(&pwr->lock);