[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240816082304.14115-6-pstanner@redhat.com>
Date: Fri, 16 Aug 2024 10:22:57 +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
Subject: [PATCH v3 05/10] intel_th: pci: 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/hwtracing/intel_th/pci.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index 0d7b9839e5b6..e9d8d28e055f 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -23,7 +23,6 @@ enum {
TH_PCI_RTIT_BAR = 4,
};
-#define BAR_MASK (BIT(TH_PCI_CONFIG_BAR) | BIT(TH_PCI_STH_SW_BAR))
#define PCI_REG_NPKDSC 0x80
#define NPKDSC_TSACT BIT(5)
@@ -83,10 +82,16 @@ static int intel_th_pci_probe(struct pci_dev *pdev,
if (err)
return err;
- err = pcim_iomap_regions_request_all(pdev, BAR_MASK, DRIVER_NAME);
+ err = pcim_request_all_regions(pdev, DRIVER_NAME);
if (err)
return err;
+ if (!pcim_iomap(pdev, TH_PCI_CONFIG_BAR, 0))
+ return -ENOMEM;
+
+ if (!pcim_iomap(pdev, TH_PCI_STH_SW_BAR, 0))
+ return -ENOMEM;
+
if (pdev->resource[TH_PCI_RTIT_BAR].start) {
resource[TH_MMIO_RTIT] = pdev->resource[TH_PCI_RTIT_BAR];
r++;
--
2.46.0
Powered by blists - more mailing lists