From: Philipp Stanner <phasta@kernel.org>
To: Yong Zhi <yong.zhi@intel.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Bingbu Cao <bingbu.cao@intel.com>,
Dan Scally <djrscally@gmail.com>,
Tianshu Qiu <tian.shu.qiu@intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Akihiro Tsukada <tskd08@gmail.com>,
Bluecherry Maintainers <maintainers@bluecherrydvr.com>,
Andrey Utkin <andrey_utkin@fastmail.com>,
Ismael Luceno <ismael@iodev.co.uk>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Philipp Stanner <phasta@kernel.org>
Subject: [PATCH 3/5] media: intel/ipu6: Replace deprecated PCI functions
Date: Fri, 4 Apr 2025 15:53:43 +0200 [thread overview]
Message-ID: <20250404135344.93241-5-phasta@kernel.org> (raw)
In-Reply-To: <20250404135344.93241-2-phasta@kernel.org>
pcim_iomap_table() and pcim_iomap_regions() have been deprecated.
Furthermore, the "name" parameter in pcim_iomap_regions() and its
successor, pcim_iomap_region(), should always reflect the driver name,
whereas currently it is the device's name.
Replace the deprecated functions with pcim_iomap_region() and pass the
actual driver name.
Signed-off-by: Philipp Stanner <phasta@kernel.org>
---
drivers/media/pci/intel/ipu6/ipu6.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/ipu6/ipu6.c
index 277af7cda8ee..345662542a64 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -525,11 +525,11 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
phys = pci_resource_start(pdev, IPU6_PCI_BAR);
dev_dbg(dev, "IPU6 PCI bar[%u] = %pa\n", IPU6_PCI_BAR, &phys);
- ret = pcim_iomap_regions(pdev, 1 << IPU6_PCI_BAR, pci_name(pdev));
- if (ret)
- return dev_err_probe(dev, ret, "Failed to I/O mem remapping\n");
+ isp->base = pcim_iomap_region(pdev, IPU6_PCI_BAR, IPU6_NAME);
+ if (IS_ERR(isp->base))
+ return dev_err_probe(dev, PTR_ERR(isp->base),
+ "Failed to I/O mem remapping\n");
- isp->base = pcim_iomap_table(pdev)[IPU6_PCI_BAR];
pci_set_drvdata(pdev, isp);
pci_set_master(pdev);
--
2.48.1
next prev parent reply other threads:[~2025-04-04 13:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-04 13:53 [PATCH 0/5] media: Replace deprecated PCI functions Philipp Stanner
2025-04-04 13:53 ` [PATCH 1/5] media: ipu3-cio2: " Philipp Stanner
2025-04-04 13:53 ` [PATCH 2/5] media: pt3: " Philipp Stanner
2025-04-15 14:16 ` Akihiro TSUKADA
2025-04-04 13:53 ` Philipp Stanner [this message]
2025-04-04 13:53 ` [PATCH 4/5] media: solo6x10: " Philipp Stanner
2025-07-29 4:08 ` Ismael Luceno
2025-04-04 13:53 ` [PATCH 5/5] media: tw5864: " Philipp Stanner
2025-04-14 9:06 ` [PATCH 0/5] media: " Philipp Stanner
2025-04-14 9:15 ` Sakari Ailus
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=20250404135344.93241-5-phasta@kernel.org \
--to=phasta@kernel.org \
--cc=andrey_utkin@fastmail.com \
--cc=bingbu.cao@intel.com \
--cc=djrscally@gmail.com \
--cc=ismael@iodev.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maintainers@bluecherrydvr.com \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tian.shu.qiu@intel.com \
--cc=tskd08@gmail.com \
--cc=yong.zhi@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.