Skip to content

Commit 6cc685f

Browse files
committed
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
2 parents da95969 + 522ae89 commit 6cc685f

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

drivers/counter/ftm-quaddec.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ static const struct of_device_id ftm_quaddec_match[] = {
311311
{ .compatible = "fsl,ftm-quaddec" },
312312
{},
313313
};
314+
MODULE_DEVICE_TABLE(of, ftm_quaddec_match);
314315

315316
static struct platform_driver ftm_quaddec_driver = {
316317
.driver = {

drivers/counter/intel-qep.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,9 @@ static int intel_qep_probe(struct pci_dev *pci, const struct pci_device_id *id)
408408

409409
pci_set_master(pci);
410410

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

419415
qep->dev = dev;
420416
qep->regs = regs;

0 commit comments

Comments
 (0)