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

pwm: Replace deprecated PCI functions

pcim_iomap_table() and pcim_request_regions() have been deprecated in
commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()") and commit d140f80f60358 ("PCI:
Deprecate pcim_iomap_regions() in favor of pcim_iomap_region()").

Replace these functions with pcim_iomap_region().

Additionally, pass the actual driver names to pcim_iomap_region()
instead of the previous pci_name(), since the 'name' parameter should
always reflect which driver owns a region.

Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Link: https://lore.kernel.org/r/20241111090944.11293-2-pstanner@redhat.com
Signed-off-by: Uwe Kleine-König <ukleinek@kernel.org>

authored by

Philipp Stanner and committed by
Uwe Kleine-König
10435e0d edc19bd0

+10 -13
+5 -9
drivers/pwm/pwm-dwc.c
··· 66 66 67 67 pci_set_master(pci); 68 68 69 - ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci)); 70 - if (ret) 71 - return dev_err_probe(dev, ret, "Failed to iomap PCI BAR\n"); 72 - 73 69 info = (const struct dwc_pwm_info *)id->driver_data; 74 70 ddata = devm_kzalloc(dev, struct_size(ddata, chips, info->nr), GFP_KERNEL); 75 71 if (!ddata) 76 72 return -ENOMEM; 77 73 78 - /* 79 - * No need to check for pcim_iomap_table() failure, 80 - * pcim_iomap_regions() already does it for us. 81 - */ 82 - ddata->io_base = pcim_iomap_table(pci)[0]; 74 + ddata->io_base = pcim_iomap_region(pci, 0, "pwm-dwc"); 75 + if (IS_ERR(ddata->io_base)) 76 + return dev_err_probe(dev, PTR_ERR(ddata->io_base), 77 + "Failed to request / iomap PCI BAR\n"); 78 + 83 79 ddata->info = info; 84 80 85 81 for (idx = 0; idx < ddata->info->nr; idx++) {
+5 -4
drivers/pwm/pwm-lpss-pci.c
··· 18 18 const struct pci_device_id *id) 19 19 { 20 20 const struct pwm_lpss_boardinfo *info; 21 + void __iomem *io_base; 21 22 struct pwm_chip *chip; 22 23 int err; 23 24 ··· 26 25 if (err < 0) 27 26 return err; 28 27 29 - err = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev)); 30 - if (err) 31 - return err; 28 + io_base = pcim_iomap_region(pdev, 0, "pwm-lpss"); 29 + if (IS_ERR(io_base)) 30 + return PTR_ERR(io_base); 32 31 33 32 info = (struct pwm_lpss_boardinfo *)id->driver_data; 34 - chip = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info); 33 + chip = devm_pwm_lpss_probe(&pdev->dev, io_base, info); 35 34 if (IS_ERR(chip)) 36 35 return PTR_ERR(chip); 37 36