mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
- Replace deprecated PCI functions used in intel-mid
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAmc7W2sACgkQEsHwGGHe VUoMPxAAqwuB04TbhSdXA+ScEv5Y8J2MTtrFHkGTjvutiQsaWpRFdlLL79+TbfAt hnOsX9FoeFuuJBBovB48A2PPLdfocnz8y5vH8JXHDzH/aMi64wbWmNlrR86rlYX9 L5Wz7NB40aKncF5EY5kTu0pQiFllrDsdbys89IMNJNZFjCi/M2/ffU9nIHlAITmW 3aHdiIW0VPZ5Ip05/f2tNdCLjuRpbC9FhZK4bFZ8+9q0FMZY5OBEScZvzbbgLWTI vdftZILzF9vzzBvy3mL0FSklED/EPzpN5DiKuJQaw0WLQokMy4JXj9395roeULWs 82zzg4q1wTfNJVEAxmTcR2I62Z8KK3DNlfAFeIrgFyoTuAAUCIikhf3krHEboc/B wTC8naSef7ZZWmaUDPk/Mfdo45OuuFQXrFkEucYr1S8GS/htfERMs4cwBq5EDrtu YgHCdlNYe8gUScsjs2hogIiE55JxDyQvMZIHGpqwwBovWF17G5jJGyiOhpWuB1Lq kjNo3EEW4wCr+Rb8CSVH8pa4783sxV94LAoUaY03L8HD2PevwFn9L1FffVulX+zF DmAjubqXPRInr/6HvO7P/IAQqwESBtLYz7ZF4yp+VRkDz47Iew7r2DN0TPhd2GdV +vjfJ8hONrTywvmLwpQ5jp6r+ls4FF9ua6qcBzGpQoKXnvf41b8= =ok9C -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
9db8b24070
@ -358,18 +358,18 @@ static int mid_pwr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||||||
return ret;
|
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);
|
pwr = devm_kzalloc(dev, sizeof(*pwr), GFP_KERNEL);
|
||||||
if (!pwr)
|
if (!pwr)
|
||||||
return -ENOMEM;
|
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->dev = dev;
|
||||||
pwr->regs = pcim_iomap_table(pdev)[0];
|
|
||||||
pwr->irq = pdev->irq;
|
pwr->irq = pdev->irq;
|
||||||
|
|
||||||
mutex_init(&pwr->lock);
|
mutex_init(&pwr->lock);
|
||||||
|
Loading…
Reference in New Issue
Block a user