[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250416131241.107903-26-phasta@kernel.org>
Date: Wed, 16 Apr 2025 15:12:35 +0200
From: Philipp Stanner <phasta@...nel.org>
To: Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
Jaya Kumar <jayakumar.alsa@...il.com>,
Clemens Ladisch <clemens@...isch.de>,
Cezary Rojewski <cezary.rojewski@...el.com>,
Liam Girdwood <liam.r.girdwood@...ux.intel.com>,
Peter Ujfalusi <peter.ujfalusi@...ux.intel.com>,
Bard Liao <yung-chuan.liao@...ux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@...ux.intel.com>,
Kai Vehmanen <kai.vehmanen@...ux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@...ux.dev>,
Mark Brown <broonie@...nel.org>,
Daniel Baluta <daniel.baluta@....com>,
Colin Ian King <colin.i.king@...il.com>,
Philipp Stanner <phasta@...nel.org>,
David Rhodes <drhodes@...nsource.cirrus.com>,
liujing <liujing@...s.chinamobile.com>,
Jerome Brunet <jbrunet@...libre.com>,
Andres Urian Florez <andres.emb.sys@...il.com>,
Oswald Buddenhagen <oswald.buddenhagen@....de>,
Thorsten Blum <thorsten.blum@...ux.dev>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...nel.org>,
Amadeusz Sławiński <amadeuszx.slawinski@...ux.intel.com>,
Charles Keepax <ckeepax@...nsource.cirrus.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org,
sound-open-firmware@...a-project.org
Subject: [PATCH 25/31] ALSA: emu10k1: Use pure devres PCI
pci_request_regions() is a hybrid function which becomes managed if
pcim_enable_device() was called before. This hybrid nature is deprecated
and should not be used anymore.
Replace pci_request_regions() with the always-managed function
pcim_request_all_regions().
Signed-off-by: Philipp Stanner <phasta@...nel.org>
---
sound/pci/emu10k1/emu10k1_main.c | 2 +-
sound/pci/emu10k1/emu10k1x.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 5b8a5ba825bd..bbe252b8916c 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1563,7 +1563,7 @@ int snd_emu10k1_create(struct snd_card *card,
else
emu->gpr_base = FXGPREGBASE;
- err = pci_request_regions(pci, "EMU10K1");
+ err = pcim_request_all_regions(pci, "EMU10K1");
if (err < 0)
return err;
emu->port = pci_resource_start(pci, 0);
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 89043392f3ec..30ac37b5a214 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -884,7 +884,7 @@ static int snd_emu10k1x_create(struct snd_card *card,
spin_lock_init(&chip->emu_lock);
spin_lock_init(&chip->voice_lock);
- err = pci_request_regions(pci, "EMU10K1X");
+ err = pcim_request_all_regions(pci, "EMU10K1X");
if (err < 0)
return err;
chip->port = pci_resource_start(pci, 0);
--
2.48.1
Powered by blists - more mailing lists