linux-kernel - [PATCH v3 08/10] serial: rp2: 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: <20240816082304.14115-9-pstanner@redhat.com>
Date: Fri, 16 Aug 2024 10:23:00 +0200
From: Philipp Stanner <pstanner@...hat.com>
To: Giovanni Cabiddu <giovanni.cabiddu@...el.com>,
	Herbert Xu <herbert@...dor.apana.org.au>,
	"David S. Miller" <davem@...emloft.net>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Jie Wang <jie.wang@...el.com>,
	Shashank Gupta <shashank.gupta@...el.com>,
	Philipp Stanner <pstanner@...hat.com>,
	Adam Guerin <adam.guerin@...el.com>,
	Tero Kristo <tero.kristo@...ux.intel.com>,
	Boris Brezillon <bbrezillon@...nel.org>,
	Arnaud Ebalard <arno@...isbad.org>,
	Srujana Challa <schalla@...vell.com>,
	Nithin Dabilpuram <ndabilpuram@...vell.com>,
	Bharat Bhushan <bbhushan2@...vell.com>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Miri Korenblit <miriam.rachel.korenblit@...el.com>,
	Kalle Valo <kvalo@...nel.org>,
	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>,
	Jonathan Corbet <corbet@....net>,
	Bjorn Helgaas <bhelgaas@...gle.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>
Cc: qat-linux@...el.com,
	linux-crypto@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-wireless@...r.kernel.org,
	linux-doc@...r.kernel.org,
	linux-pci@...r.kernel.org,
	Jiri Slaby <jirislaby@...nel.org>
Subject: [PATCH v3 08/10] serial: rp2: 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>
Reviewed-by: Jiri Slaby <jirislaby@...nel.org>
---
 drivers/tty/serial/rp2.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/serial/rp2.c b/drivers/tty/serial/rp2.c
index 4132fcff7d4e..b6b30bb956fa 100644
--- a/drivers/tty/serial/rp2.c
+++ b/drivers/tty/serial/rp2.c
@@ -698,7 +698,6 @@ static int rp2_probe(struct pci_dev *pdev,
 	const struct firmware *fw;
 	struct rp2_card *card;
 	struct rp2_uart_port *ports;
-	void __iomem * const *bars;
 	int rc;
 
 	card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL);
@@ -711,13 +710,16 @@ static int rp2_probe(struct pci_dev *pdev,
 	if (rc)
 		return rc;
 
-	rc = pcim_iomap_regions_request_all(pdev, 0x03, DRV_NAME);
+	rc = pcim_request_all_regions(pdev, DRV_NAME);
 	if (rc)
 		return rc;
 
-	bars = pcim_iomap_table(pdev);
-	card->bar0 = bars[0];
-	card->bar1 = bars[1];
+	card->bar0 = pcim_iomap(pdev, 0, 0);
+	if (!card->bar0)
+		return -ENOMEM;
+	card->bar1 = pcim_iomap(pdev, 1, 0);
+	if (!card->bar1)
+		return -ENOMEM;
 	card->pdev = pdev;
 
 	rp2_decode_cap(id, &card->n_ports, &card->smpte);
-- 
2.46.0