On Fri, 25 Oct 2024, Philipp Stanner wrote:
> 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().
>
> Signed-off-by: Philipp Stanner <pstanner@xxxxxxxxxx>
> Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
> ---
> drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> index 3b9943eb6934..4b41613ad89d 100644
> --- 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, "pcim_request_all_regions 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, "pcim_iomap failed\n");
This seems a step backwards as a human readable English error message was
replaced with a reference to a function name.
--
i.
> ret = -ENODEV;
> goto out_no_pci;
> }
>
