firewire: ohci: Replace deprecated PCI functions

Philipp Stanner · takaswie · commit b7688fcde3cf · 2024-10-28T19:47:09.000+09:00
pcim_iomap_regions() and pcim_iomap_table() have been deprecated in commit e354bb8 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with pcim_iomap_region(). Signed-off-by: Philipp Stanner <pstanner@redhat.com> Link: https://lore.kernel.org/r/20241028094440.19115-3-pstanner@redhat.com Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
@@ -3726,12 +3726,11 @@ static int pci_probe(struct pci_dev *dev,
 		return -ENXIO;
 	}
 
-	err = pcim_iomap_regions(dev, 1 << 0, ohci_driver_name);
-	if (err) {
+	ohci->registers = pcim_iomap_region(dev, 0, ohci_driver_name);
+	if (IS_ERR(ohci->registers)) {
 		ohci_err(ohci, "request and map MMIO resource unavailable\n");
 		return -ENXIO;
 	}
-	ohci->registers = pcim_iomap_table(dev)[0];
 
 	for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)
 		if ((ohci_quirks[i].vendor == dev->vendor) &&

Original file line number	Diff line number	Diff line change
`@@ -3726,12 +3726,11 @@ static int pci_probe(struct pci_dev *dev,`
`3726`	`3726`	`return -ENXIO;`
`3727`	`3727`	`}`
`3728`	`3728`
`3729`		`- err = pcim_iomap_regions(dev, 1 << 0, ohci_driver_name);`
`3730`		`- if (err) {`
	`3729`	`+ ohci->registers = pcim_iomap_region(dev, 0, ohci_driver_name);`
	`3730`	`+ if (IS_ERR(ohci->registers)) {`
`3731`	`3731`	`ohci_err(ohci, "request and map MMIO resource unavailable\n");`
`3732`	`3732`	`return -ENXIO;`
`3733`	`3733`	`}`
`3734`		`- ohci->registers = pcim_iomap_table(dev)[0];`
`3735`	`3734`
`3736`	`3735`	`for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)`
`3737`	`3736`	`if ((ohci_quirks[i].vendor == dev->vendor) &&`