From: Philipp Stanner <pstanner@redhat.com>
To: "Jonathan Corbet" <corbet@lwn.net>,
"Damien Le Moal" <dlemoal@kernel.org>,
"Niklas Cassel" <cassel@kernel.org>,
"Giovanni Cabiddu" <giovanni.cabiddu@intel.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
"Boris Brezillon" <bbrezillon@kernel.org>,
"Arnaud Ebalard" <arno@natisbad.org>,
"Srujana Challa" <schalla@marvell.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Miri Korenblit" <miriam.rachel.korenblit@intel.com>,
"Kalle Valo" <kvalo@kernel.org>,
"Serge Semin" <fancer.lancer@gmail.com>,
"Jon Mason" <jdmason@kudzu.us>,
"Dave Jiang" <dave.jiang@intel.com>,
"Allen Hubbe" <allenbh@gmail.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Kevin Cernekee" <cernekee@gmail.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Jiri Slaby" <jirislaby@kernel.org>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Mark Brown" <broonie@kernel.org>,
"David Lechner" <dlechner@baylibre.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Philipp Stanner" <pstanner@redhat.com>,
"Jie Wang" <jie.wang@intel.com>,
"Adam Guerin" <adam.guerin@intel.com>,
"Shashank Gupta" <shashank.gupta@intel.com>,
"Damian Muszynski" <damian.muszynski@intel.com>,
"Nithin Dabilpuram" <ndabilpuram@marvell.com>,
"Bharat Bhushan" <bbhushan2@marvell.com>,
"Johannes Berg" <johannes.berg@intel.com>,
"Gregory Greenman" <gregory.greenman@intel.com>,
"Emmanuel Grumbach" <emmanuel.grumbach@intel.com>,
"Yedidya Benshimol" <yedidya.ben.shimol@intel.com>,
"Breno Leitao" <leitao@debian.org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"John Ogness" <john.ogness@linutronix.de>,
"Thomas Gleixner" <tglx@linutronix.de>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ide@vger.kernel.org, qat-linux@intel.com,
linux-crypto@vger.kernel.org, linux-wireless@vger.kernel.org,
ntb@lists.linux.dev, linux-pci@vger.kernel.org,
linux-serial@vger.kernel.org, linux-sound@vger.kernel.org
Subject: [PATCH 07/10] ntb: idt: Replace deprecated PCI functions
Date: Thu, 1 Aug 2024 19:46:05 +0200 [thread overview]
Message-ID: <20240801174608.50592-8-pstanner@redhat.com> (raw)
In-Reply-To: <20240801174608.50592-1-pstanner@redhat.com>
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@redhat.com>
---
drivers/ntb/hw/idt/ntb_hw_idt.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index 48dfb1a69a77..f1b57d51a814 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2671,15 +2671,20 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
*/
pci_set_master(pdev);
- /* Request all BARs resources and map BAR0 only */
- ret = pcim_iomap_regions_request_all(pdev, 1, NTB_NAME);
+ /* Request all BARs resources */
+ ret = pcim_request_all_regions(pdev, NTB_NAME);
if (ret != 0) {
dev_err(&pdev->dev, "Failed to request resources\n");
goto err_clear_master;
}
- /* Retrieve virtual address of BAR0 - PCI configuration space */
- ndev->cfgspc = pcim_iomap_table(pdev)[0];
+ /* ioremap BAR0 - PCI configuration space */
+ ndev->cfgspc = pcim_iomap(pdev, 0, 0);
+ if (!ndev->cfgspc) {
+ dev_err(&pdev->dev, "Failed to ioremap BAR 0\n");
+ ret = -ENOMEM;
+ goto err_clear_master;
+ }
/* Put the IDT driver data pointer to the PCI-device private pointer */
pci_set_drvdata(pdev, ndev);
--
2.45.2
next prev parent reply other threads:[~2024-08-01 17:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 17:45 [PATCH 00/10] Remove pcim_iomap_regions_request_all() Philipp Stanner
2024-08-01 17:45 ` [PATCH 01/10] PCI: Make pcim_request_all_regions() a public function Philipp Stanner
2024-08-02 0:42 ` Damien Le Moal
2024-08-01 17:46 ` [PATCH 02/10] ata: ahci: Replace deprecated PCI functions Philipp Stanner
2024-08-02 0:43 ` Damien Le Moal
2024-08-01 17:46 ` [PATCH 03/10] crypto: qat - replace " Philipp Stanner
2024-08-01 17:46 ` [PATCH 04/10] crypto: marvell " Philipp Stanner
2024-08-02 7:29 ` Philipp Stanner
2024-08-01 17:46 ` [PATCH 05/10] intel_th: pci: Replace " Philipp Stanner
2024-08-01 17:46 ` [PATCH 06/10] wifi: iwlwifi: replace " Philipp Stanner
2024-08-01 17:46 ` Philipp Stanner [this message]
2024-08-01 17:56 ` [PATCH 07/10] ntb: idt: Replace " Serge Semin
2024-08-01 17:46 ` [PATCH 08/10] serial: rp2: Remove " Philipp Stanner
2024-08-02 5:18 ` Jiri Slaby
2024-08-02 7:39 ` Philipp Stanner
2024-08-01 17:46 ` [PATCH 09/10] ALSA: korg1212: Replace " Philipp Stanner
2024-08-02 8:02 ` Takashi Iwai
2024-08-01 17:46 ` [PATCH 10/10] PCI: Remove pcim_iomap_regions_request_all() Philipp Stanner
2024-08-02 0:44 ` Damien Le Moal
-- strict thread matches above, loose matches on Subject: below --
2024-10-25 14:59 [PATCH 00/10] " Philipp Stanner
2024-10-25 14:59 ` [PATCH 07/10] ntb: idt: Replace deprecated PCI functions Philipp Stanner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240801174608.50592-8-pstanner@redhat.com \
--to=pstanner@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=adam.guerin@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=allenbh@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arno@natisbad.org \
--cc=bbhushan2@marvell.com \
--cc=bbrezillon@kernel.org \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=cassel@kernel.org \
--cc=cernekee@gmail.com \
--cc=corbet@lwn.net \
--cc=damian.muszynski@intel.com \
--cc=dave.jiang@intel.com \
--cc=davem@davemloft.net \
--cc=dlechner@baylibre.com \
--cc=dlemoal@kernel.org \
--cc=emmanuel.grumbach@intel.com \
--cc=fancer.lancer@gmail.com \
--cc=giovanni.cabiddu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=gregory.greenman@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jdmason@kudzu.us \
--cc=jie.wang@intel.com \
--cc=jirislaby@kernel.org \
--cc=johannes.berg@intel.com \
--cc=john.ogness@linutronix.de \
--cc=kvalo@kernel.org \
--cc=leitao@debian.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=ndabilpuram@marvell.com \
--cc=ntb@lists.linux.dev \
--cc=perex@perex.cz \
--cc=qat-linux@intel.com \
--cc=schalla@marvell.com \
--cc=shashank.gupta@intel.com \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=yedidya.ben.shimol@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).