Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pwm: Replace deprecated PCI functions 

pcim_iomap_table() and pcim_request_regions() have been deprecated in
commit e354bb84a4 ("PCI: Deprecate pcim_iomap_table(),
pcim_iomap_regions_request_all()") and commit d140f80f60 ("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>
This commit is contained in:
Philipp Stanner 2024-11-11 10:09:45 +01:00 committed by Uwe Kleine-König
parent edc19bd0e5
commit 10435e0d23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pwm/pwm-dwc.c
View File

@ -66,20 +66,16 @@ static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id)
pci_set_master(pci); pci_set_master(pci);
ret = pcim_iomap_regions(pci, BIT(0), pci_name(pci));
if (ret)
return dev_err_probe(dev, ret, "Failed to iomap PCI BAR\n");
info = (const struct dwc_pwm_info *)id->driver_data; info = (const struct dwc_pwm_info *)id->driver_data;
ddata = devm_kzalloc(dev, struct_size(ddata, chips, info->nr), GFP_KERNEL); ddata = devm_kzalloc(dev, struct_size(ddata, chips, info->nr), GFP_KERNEL);
if (!ddata) if (!ddata)
return -ENOMEM; return -ENOMEM;
/* ddata->io_base = pcim_iomap_region(pci, 0, "pwm-dwc");
* No need to check for pcim_iomap_table() failure, if (IS_ERR(ddata->io_base))
* pcim_iomap_regions() already does it for us. return dev_err_probe(dev, PTR_ERR(ddata->io_base),
*/ "Failed to request / iomap PCI BAR\n");
ddata->io_base = pcim_iomap_table(pci)[0];
ddata->info = info; ddata->info = info;
for (idx = 0; idx < ddata->info->nr; idx++) { for (idx = 0; idx < ddata->info->nr; idx++) {

9
drivers/pwm/pwm-lpss-pci.c
View File

@ -18,6 +18,7 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
const struct pwm_lpss_boardinfo *info; const struct pwm_lpss_boardinfo *info;
void __iomem *io_base;
struct pwm_chip *chip; struct pwm_chip *chip;
int err; int err;
@ -25,12 +26,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
if (err < 0) if (err < 0)
return err; return err;
err = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev)); io_base = pcim_iomap_region(pdev, 0, "pwm-lpss");
if (err) if (IS_ERR(io_base))
return err; return PTR_ERR(io_base);
info = (struct pwm_lpss_boardinfo *)id->driver_data; info = (struct pwm_lpss_boardinfo *)id->driver_data;
chip = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info); chip = devm_pwm_lpss_probe(&pdev->dev, io_base, info);
if (IS_ERR(chip)) if (IS_ERR(chip))
return PTR_ERR(chip); return PTR_ERR(chip);