github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Counter updates for 6.13

Browse Source 
Add MODULE_DEVICE_TABLE() for ftm-quaddec to autoload based on the alias
 from of_device_id table. Replace deprecated pcim_iomap_regions() and
 pcim_iomap_table() calls with pcim_iomap_region() in intel-eqp.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQSNN83d4NIlKPjon7a1SFbKvhIjKwUCZyxh0wAKCRC1SFbKvhIj
 K7QQAQDhqiky38nbK1qoD1AbuUXWbbv7zgefd6E0F96aZETdXAEAsE26NV7+qPBW
 qpuzhHazfAGQoxtmDjPc1SIz0q+BVAY=
 =Nf3n
 -----END PGP SIGNATURE-----

Merge tag 'counter-updates-for-6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next

William writes:

Counter updates for 6.13

Add MODULE_DEVICE_TABLE() for ftm-quaddec to autoload based on the alias
from of_device_id table. Replace deprecated pcim_iomap_regions() and
pcim_iomap_table() calls with pcim_iomap_region() in intel-eqp.

* tag 'counter-updates-for-6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: intel-qep: Replace deprecated PCI functions
  counter: ftm-quaddec: Enable module autoloading
This commit is contained in:
Greg Kroah-Hartman 2024-11-07 08:00:55 +01:00
commit 6cc685facb
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/counter/ftm-quaddec.c
View File

@ -311,6 +311,7 @@ static const struct of_device_id ftm_quaddec_match[] = {
{ .compatible = "fsl,ftm-quaddec" },
{},
};
MODULE_DEVICE_TABLE(of, ftm_quaddec_match);
static struct platform_driver ftm_quaddec_driver = {
.driver = {

10
drivers/counter/intel-qep.c
View File

@ -408,13 +408,9 @@ static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id)
pci_set_master(pci);
ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci));
if (ret)
return ret;
regs = pcim_iomap_table(pci)[0];
if (!regs)
return -ENOMEM;
regs = pcim_iomap_region(pci, 0, pci_name(pci));
if (IS_ERR(regs))
return PTR_ERR(regs);
qep->dev = dev;
qep->regs = regs;