tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Greg Kroah-Hartman 6cc685fa da959695

+4 -7
+1
drivers/counter/ftm-quaddec.c
··· 311 311 { .compatible = "fsl,ftm-quaddec" }, 312 312 {}, 313 313 }; 314 + MODULE_DEVICE_TABLE(of, ftm_quaddec_match); 314 315 315 316 static struct platform_driver ftm_quaddec_driver = { 316 317 .driver = {
+3 -7
drivers/counter/intel-qep.c
··· 408 408 409 409 pci_set_master(pci); 410 410 411 - ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci)); 412 - if (ret) 413 - return ret; 414 - 415 - regs = pcim_iomap_table(pci)[0]; 416 - if (!regs) 417 - return -ENOMEM; 411 + regs = pcim_iomap_region(pci, 0, pci_name(pci)); 412 + if (IS_ERR(regs)) 413 + return PTR_ERR(regs); 418 414 419 415 qep->dev = dev; 420 416 qep->regs = regs;