From: Philipp Stanner <phasta@kernel.org>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Clemens Ladisch <clemens@ladisch.de>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Thorsten Blum <thorsten.blum@linux.dev>,
Philipp Stanner <phasta@kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Maxim Mikityanskiy <maxtram95@gmail.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
He Lugang <helugang@uniontech.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Binbin Zhou <zhoubinbin@loongson.cn>,
Tang Bin <tangbin@cmss.chinamobile.com>
Cc: linux-parisc@vger.kernel.org, linux-sound@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 11/11] ASoC: loongson: Replace deprecated PCI functions
Date: Fri, 4 Apr 2025 14:19:12 +0200 [thread overview]
Message-ID: <20250404121911.85277-13-phasta@kernel.org> (raw)
In-Reply-To: <20250404121911.85277-2-phasta@kernel.org>
pcim_iomap_table() and pcim_iomap_regions() have been deprecated.
Replace them with pcim_iomap_region().
Signed-off-by: Philipp Stanner <phasta@kernel.org>
---
sound/soc/loongson/loongson_i2s_pci.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/sound/soc/loongson/loongson_i2s_pci.c b/sound/soc/loongson/loongson_i2s_pci.c
index d2d0e5d8cac9..1ea5501a97f8 100644
--- a/sound/soc/loongson/loongson_i2s_pci.c
+++ b/sound/soc/loongson/loongson_i2s_pci.c
@@ -16,6 +16,8 @@
#include "loongson_i2s.h"
#include "loongson_dma.h"
+#define DRIVER_NAME "loongson-i2s-pci"
+
static bool loongson_i2s_wr_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
@@ -92,13 +94,12 @@ static int loongson_i2s_pci_probe(struct pci_dev *pdev,
i2s->dev = dev;
pci_set_drvdata(pdev, i2s);
- ret = pcim_iomap_regions(pdev, 1 << 0, dev_name(dev));
- if (ret < 0) {
- dev_err(dev, "iomap_regions failed\n");
- return ret;
+ i2s->reg_base = pcim_iomap_region(pdev, 0, DRIVER_NAME);
+ if (IS_ERR(i2s->reg_base)) {
+ dev_err(dev, "iomap_region failed\n");
+ return PTR_ERR(i2s->reg_base);
}
- i2s->reg_base = pcim_iomap_table(pdev)[0];
i2s->regmap = devm_regmap_init_mmio(dev, i2s->reg_base,
&loongson_i2s_regmap_config);
if (IS_ERR(i2s->regmap))
@@ -147,7 +148,7 @@ static const struct pci_device_id loongson_i2s_ids[] = {
MODULE_DEVICE_TABLE(pci, loongson_i2s_ids);
static struct pci_driver loongson_i2s_driver = {
- .name = "loongson-i2s-pci",
+ .name = DRIVER_NAME,
.id_table = loongson_i2s_ids,
.probe = loongson_i2s_pci_probe,
.driver = {
--
2.48.1
next prev parent reply other threads:[~2025-04-04 12:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-04 12:19 [PATCH 00/11] sound: Replace deprecated PCI functions Philipp Stanner
2025-04-04 12:19 ` [PATCH 01/11] ALSA: ad1889: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 02/11] ALSA: atiixp: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 03/11] ALSA: au88x0: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 04/11] ALSA: aw2: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 05/11] ALSA: bt87x: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 06/11] ALSA: cs4281: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 07/11] ALSA: hda_intel: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 08/11] ALSA: cs5530: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 09/11] ALSA: lola: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 10/11] ALSA: hdspm: " Philipp Stanner
2025-04-04 12:19 ` Philipp Stanner [this message]
2025-04-04 13:47 ` [PATCH 00/11] sound: " Takashi Iwai
2025-04-04 13:49 ` Philipp Stanner
2025-04-07 7:24 ` Takashi Iwai
2025-04-07 23:35 ` (subset) " Mark Brown
2025-04-08 5:22 ` Takashi Iwai
2025-04-08 9:26 ` Mark Brown
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=20250404121911.85277-13-phasta@kernel.org \
--to=phasta@kernel.org \
--cc=broonie@kernel.org \
--cc=clemens@ladisch.de \
--cc=helugang@uniontech.com \
--cc=hkallweit1@gmail.com \
--cc=jbrunet@baylibre.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=maxtram95@gmail.com \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.dev \
--cc=tangbin@cmss.chinamobile.com \
--cc=thorsten.blum@linux.dev \
--cc=tiwai@suse.com \
--cc=yung-chuan.liao@linux.intel.com \
--cc=zhoubinbin@loongson.cn \
/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.