Linux Sound subsystem development
 help / color / mirror / Atom feed
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 09/11] ALSA: lola: Replace deprecated PCI functions
Date: Fri,  4 Apr 2025 14:19:10 +0200	[thread overview]
Message-ID: <20250404121911.85277-11-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/pci/lola/lola.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 1aa30e90b86a..fb8bd54e4c2d 100644
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -541,6 +541,7 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci, int dev)
 	struct lola *chip = card->private_data;
 	int err;
 	unsigned int dever;
+	void __iomem *iomem;
 
 	err = pcim_enable_device(pci);
 	if (err < 0)
@@ -580,14 +581,19 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci, int dev)
 		chip->sample_rate_min = 16000;
 	}
 
-	err = pcim_iomap_regions(pci, (1 << 0) | (1 << 2), DRVNAME);
-	if (err < 0)
-		return err;
+	iomem = pcim_iomap_region(pci, 0, DRVNAME);
+	if (IS_ERR(iomem))
+		return PTR_ERR(iomem);
 
+	chip->bar[0].remap_addr = iomem;
 	chip->bar[0].addr = pci_resource_start(pci, 0);
-	chip->bar[0].remap_addr = pcim_iomap_table(pci)[0];
+
+	iomem = pcim_iomap_region(pci, 2, DRVNAME);
+	if (IS_ERR(iomem))
+		return PTR_ERR(iomem);
+
+	chip->bar[1].remap_addr = iomem;
 	chip->bar[1].addr = pci_resource_start(pci, 2);
-	chip->bar[1].remap_addr = pcim_iomap_table(pci)[2];
 
 	pci_set_master(pci);
 
-- 
2.48.1


  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 ` Philipp Stanner [this message]
2025-04-04 12:19 ` [PATCH 10/11] ALSA: hdspm: " Philipp Stanner
2025-04-04 12:19 ` [PATCH 11/11] ASoC: loongson: " Philipp Stanner
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-11-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox