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>

diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c
index fb3eadf6fbc464773b17c30235c51f5a4ff6917f..b6c16139ce4abe079f795b5d8c5267f588161023 100644 (file)
--- a/drivers/pwm/pwm-dwc.c
+++ b/drivers/pwm/pwm-dwc.c
@@ -66,20 +66,16 @@ static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id)
 
        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;
        ddata = devm_kzalloc(dev, struct_size(ddata, chips, info->nr), GFP_KERNEL);
        if (!ddata)
                return -ENOMEM;
 
-       /*
-        * No need to check for pcim_iomap_table() failure,
-        * pcim_iomap_regions() already does it for us.
-        */
-       ddata->io_base = pcim_iomap_table(pci)[0];
+       ddata->io_base = pcim_iomap_region(pci, 0, "pwm-dwc");
+       if (IS_ERR(ddata->io_base))
+               return dev_err_probe(dev, PTR_ERR(ddata->io_base),
+                                    "Failed to request / iomap PCI BAR\n");
+
        ddata->info = info;
 
        for (idx = 0; idx < ddata->info->nr; idx++) {

diff --git a/drivers/pwm/pwm-lpss-pci.c b/drivers/pwm/pwm-lpss-pci.c
index f7ece2809e6bba49b6b9fa3e43bf9dfb051b8dde..823f570afb8074227ab05dd902220e7310bb5eda 100644 (file)
--- a/drivers/pwm/pwm-lpss-pci.c
+++ b/drivers/pwm/pwm-lpss-pci.c
@@ -18,6 +18,7 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
        const struct pwm_lpss_boardinfo *info;
+       void __iomem *io_base;
        struct pwm_chip *chip;
        int err;
 
@@ -25,12 +26,12 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
        if (err < 0)
                return err;
 
-       err = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));
-       if (err)
-               return err;
+       io_base = pcim_iomap_region(pdev, 0, "pwm-lpss");
+       if (IS_ERR(io_base))
+               return PTR_ERR(io_base);
 
        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))
                return PTR_ERR(chip);