Commit 9db8b240 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_platform_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform cleanup from Borislav Petkov:

 - Replace deprecated PCI functions used in intel-mid

* tag 'x86_platform_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/intel-mid: Replace deprecated PCI functions
parents ab713e70 90f1b42b

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);