linux-kernel - [PATCH 06/10] wifi: iwlwifi: replace deprecated PCI functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240801174608.50592-7-pstanner@redhat.com>
Date: Thu,  1 Aug 2024 19:46:04 +0200
From: Philipp Stanner <pstanner@...hat.com>
To: Jonathan Corbet <corbet@....net>,
	Damien Le Moal <dlemoal@...nel.org>,
	Niklas Cassel <cassel@...nel.org>,
	Giovanni Cabiddu <giovanni.cabiddu@...el.com>,
	Herbert Xu <herbert@...dor.apana.org.au>,
	"David S. Miller" <davem@...emloft.net>,
	Boris Brezillon <bbrezillon@...nel.org>,
	Arnaud Ebalard <arno@...isbad.org>,
	Srujana Challa <schalla@...vell.com>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Miri Korenblit <miriam.rachel.korenblit@...el.com>,
	Kalle Valo <kvalo@...nel.org>,
	Serge Semin <fancer.lancer@...il.com>,
	Jon Mason <jdmason@...zu.us>,
	Dave Jiang <dave.jiang@...el.com>,
	Allen Hubbe <allenbh@...il.com>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Kevin Cernekee <cernekee@...il.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Jiri Slaby <jirislaby@...nel.org>,
	Jaroslav Kysela <perex@...ex.cz>,
	Takashi Iwai <tiwai@...e.com>,
	Mark Brown <broonie@...nel.org>,
	David Lechner <dlechner@...libre.com>,
	Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
	Jonathan Cameron <Jonathan.Cameron@...wei.com>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Philipp Stanner <pstanner@...hat.com>,
	Jie Wang <jie.wang@...el.com>,
	Adam Guerin <adam.guerin@...el.com>,
	Shashank Gupta <shashank.gupta@...el.com>,
	Damian Muszynski <damian.muszynski@...el.com>,
	Nithin Dabilpuram <ndabilpuram@...vell.com>,
	Bharat Bhushan <bbhushan2@...vell.com>,
	Johannes Berg <johannes.berg@...el.com>,
	Gregory Greenman <gregory.greenman@...el.com>,
	Emmanuel Grumbach <emmanuel.grumbach@...el.com>,
	Yedidya Benshimol <yedidya.ben.shimol@...el.com>,
	Breno Leitao <leitao@...ian.org>,
	Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	John Ogness <john.ogness@...utronix.de>,
	Thomas Gleixner <tglx@...utronix.de>
Cc: linux-doc@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-ide@...r.kernel.org,
	qat-linux@...el.com,
	linux-crypto@...r.kernel.org,
	linux-wireless@...r.kernel.org,
	ntb@...ts.linux.dev,
	linux-pci@...r.kernel.org,
	linux-serial@...r.kernel.org,
	linux-sound@...r.kernel.org
Subject: [PATCH 06/10] 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()

Signed-off-by: Philipp Stanner <pstanner@...hat.com>
---
 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 719ddc4b72c5..6b282276e7b5 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3534,7 +3534,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 */
@@ -3657,22 +3656,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");
 		ret = -ENODEV;
 		goto out_no_pci;
 	}
-- 
2.45.2