wifi: iwlwifi: replace deprecated PCI functions

pcim_iomap_table() and pcim_iomap_regions_request_all() have been
deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()").

Replace these functions with their successors, pcim_iomap() and
pcim_request_all_regions().

Link: https://lore.kernel.org/r/20241030112743.104395-7-pstanner@redhat.com
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Kalle Valo <kvalo@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 3b9943eb69341ef19061fd4f7c64d36503768558..4839dcb199c45ce055dae59913435a0eb80ab8c5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3533,7 +3533,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
        struct iwl_trans_pcie *trans_pcie, **priv;
        struct iwl_trans *trans;
        int ret, addr_size;
-       void __iomem * const *table;
        u32 bar0;
 
        /* reassign our BAR 0 if invalid due to possible runtime PM races */
@@ -3659,22 +3658,15 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
                }
        }
 
-       ret = pcim_iomap_regions_request_all(pdev, BIT(0), DRV_NAME);
+       ret = pcim_request_all_regions(pdev, DRV_NAME);
        if (ret) {
-               dev_err(&pdev->dev, "pcim_iomap_regions_request_all failed\n");
+               dev_err(&pdev->dev, "Requesting all PCI BARs failed.\n");
                goto out_no_pci;
        }
 
-       table = pcim_iomap_table(pdev);
-       if (!table) {
-               dev_err(&pdev->dev, "pcim_iomap_table failed\n");
-               ret = -ENOMEM;
-               goto out_no_pci;
-       }
-
-       trans_pcie->hw_base = table[0];
+       trans_pcie->hw_base = pcim_iomap(pdev, 0, 0);
        if (!trans_pcie->hw_base) {
-               dev_err(&pdev->dev, "couldn't find IO mem in first BAR\n");
+               dev_err(&pdev->dev, "Could not ioremap PCI BAR 0.\n");
                ret = -ENODEV;
                goto out_no_pci;
        }