From: Philipp Stanner <pstanner@redhat.com>
To: "onathan Corbet" <corbet@lwn.net>, "Jens Axboe" <axboe@kernel.dk>,
"Wu Hao" <hao.wu@intel.com>, "Tom Rix" <trix@redhat.com>,
"Moritz Fischer" <mdf@kernel.org>,
"Xu Yilun" <yilun.xu@intel.com>,
"Andy Shevchenko" <andy@kernel.org>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Bartosz Golaszewski" <brgl@bgdev.pl>,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Alexandre Torgue" <alexandre.torgue@foss.st.com>,
"Jose Abreu" <joabreu@synopsys.com>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Alvaro Karsz" <alvaro.karsz@solid-run.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
"Eugenio Pérez" <eperezma@redhat.com>,
"Richard Cochran" <richardcochran@gmail.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>,
"Philipp Stanner" <pstanner@redhat.com>,
"Hannes Reinecke" <hare@suse.de>,
"Damien Le Moal" <dlemoal@kernel.org>,
"Chaitanya Kulkarni" <kch@nvidia.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-block@vger.kernel.org, linux-fpga@vger.kernel.org,
linux-gpio@vger.kernel.org, netdev@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org,
virtualization@lists.linux.dev
Subject: [PATCH 6/9] ethernet: cavium: Replace deprecated PCI functions
Date: Mon, 19 Aug 2024 18:51:46 +0200 [thread overview]
Message-ID: <20240819165148.58201-8-pstanner@redhat.com> (raw)
In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com>
pcim_iomap_regions() and pcim_iomap_table() have been deprecated by
the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
pcim_iomap_table(), pcim_iomap_regions_request_all()").
Replace these functions with the function pcim_iomap_region().
Signed-off-by: Philipp Stanner <pstanner@redhat.com>
---
drivers/net/ethernet/cavium/common/cavium_ptp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c b/drivers/net/ethernet/cavium/common/cavium_ptp.c
index 9fd717b9cf69..1849c62cde1d 100644
--- a/drivers/net/ethernet/cavium/common/cavium_ptp.c
+++ b/drivers/net/ethernet/cavium/common/cavium_ptp.c
@@ -239,11 +239,11 @@ static int cavium_ptp_probe(struct pci_dev *pdev,
if (err)
goto error_free;
- err = pcim_iomap_regions(pdev, 1 << PCI_PTP_BAR_NO, pci_name(pdev));
- if (err)
+ clock->reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO, pci_name(pdev));
+ if (IS_ERR(clock->reg_base)) {
+ err = PTR_ERR(clock->reg_base);
goto error_free;
-
- clock->reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO];
+ }
spin_lock_init(&clock->spin_lock);
@@ -292,7 +292,7 @@ static int cavium_ptp_probe(struct pci_dev *pdev,
clock_cfg = readq(clock->reg_base + PTP_CLOCK_CFG);
clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN;
writeq(clock_cfg, clock->reg_base + PTP_CLOCK_CFG);
- pcim_iounmap_regions(pdev, 1 << PCI_PTP_BAR_NO);
+ pcim_iounmap_region(pdev, PCI_PTP_BAR_NO);
error_free:
devm_kfree(dev, clock);
--
2.46.0
next prev parent reply other threads:[~2024-08-19 16:53 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 16:51 [PATCH 0/9] PCI: Remove pcim_iounmap_regions() Philipp Stanner
2024-08-19 16:51 ` [PATCH 1/9] PCI: Make pcim_release_region() a public function Philipp Stanner
2024-08-19 23:07 ` Damien Le Moal
2024-08-19 16:51 ` [PATCH 2/9] PCI: Make pcim_iounmap_region() " Philipp Stanner
2024-08-19 23:08 ` Damien Le Moal
2024-08-19 16:51 ` [PATCH 3/9] fpga/dfl-pci.c: Replace deprecated PCI functions Philipp Stanner
2024-08-19 16:51 ` [PATCH 4/9] block: mtip32xx: " Philipp Stanner
2024-08-19 18:04 ` Andy Shevchenko
2024-08-20 7:29 ` Philipp Stanner
2024-08-20 10:28 ` Andy Shevchenko
2024-08-20 7:22 ` Philipp Stanner
2024-08-19 16:51 ` [PATCH 5/9] gpio: " Philipp Stanner
2024-08-19 18:22 ` Andy Shevchenko
2024-08-19 18:39 ` Bartosz Golaszewski
2024-08-19 16:51 ` Philipp Stanner [this message]
2024-08-19 18:23 ` [PATCH 6/9] ethernet: cavium: " Andy Shevchenko
2024-08-20 7:40 ` Philipp Stanner
2024-08-20 10:32 ` Andy Shevchenko
2024-08-19 16:51 ` [PATCH 7/9] ethernet: stmicro: Simplify PCI devres usage Philipp Stanner
2024-08-19 18:28 ` Andy Shevchenko
2024-08-20 7:52 ` Philipp Stanner
2024-08-20 10:37 ` Andy Shevchenko
2024-08-20 10:53 ` Philipp Stanner
2024-08-19 16:51 ` [PATCH 8/9] vdap: solidrun: Replace deprecated PCI functions Philipp Stanner
2024-08-19 18:19 ` Christophe JAILLET
2024-08-19 18:34 ` Andy Shevchenko
2024-08-20 8:13 ` Philipp Stanner
2024-08-20 10:35 ` Andy Shevchenko
2024-08-20 8:09 ` Philipp Stanner
2024-08-20 10:50 ` Christophe JAILLET
2024-08-20 11:14 ` Philipp Stanner
2024-08-19 18:31 ` Andy Shevchenko
2024-08-19 18:36 ` Andy Shevchenko
2024-08-19 16:51 ` [PATCH 9/9] PCI: Remove pcim_iounmap_regions() Philipp Stanner
2024-08-19 18:35 ` Andy Shevchenko
2024-08-19 23:08 ` Damien Le Moal
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=20240819165148.58201-8-pstanner@redhat.com \
--to=pstanner@redhat.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=alexandre.torgue@foss.st.com \
--cc=alvaro.karsz@solid-run.com \
--cc=andy@kernel.org \
--cc=axboe@kernel.dk \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=dlechner@baylibre.com \
--cc=dlemoal@kernel.org \
--cc=edumazet@google.com \
--cc=eperezma@redhat.com \
--cc=hao.wu@intel.com \
--cc=hare@suse.de \
--cc=jasowang@redhat.com \
--cc=joabreu@synopsys.com \
--cc=kch@nvidia.com \
--cc=kuba@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=martin.petersen@oracle.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=mdf@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=trix@redhat.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=virtualization@lists.linux.dev \
--cc=xuanzhuo@linux.alibaba.com \
--cc=yilun.xu@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.