[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250416131241.107903-3-phasta@kernel.org>
Date: Wed, 16 Apr 2025 15:12:12 +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 02/31] ASoC: intel/avs: 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().
Remove the goto jump to pci_release_regions(), since pcim_ functions
clean up automatically.
Signed-off-by: Philipp Stanner <phasta@...nel.org>
---
sound/soc/intel/avs/core.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 8fbf33e30dfc..dafe46973146 100644
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -445,7 +445,7 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
return ret;
}
- ret = pci_request_regions(pci, "AVS HDAudio");
+ ret = pcim_request_all_regions(pci, "AVS HDAudio");
if (ret < 0)
return ret;
@@ -454,8 +454,7 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
bus->remap_addr = pci_ioremap_bar(pci, 0);
if (!bus->remap_addr) {
dev_err(bus->dev, "ioremap error\n");
- ret = -ENXIO;
- goto err_remap_bar0;
+ return -ENXIO;
}
adev->dsp_ba = pci_ioremap_bar(pci, 4);
@@ -512,8 +511,6 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
iounmap(adev->dsp_ba);
err_remap_bar4:
iounmap(bus->remap_addr);
-err_remap_bar0:
- pci_release_regions(pci);
return ret;
}
--
2.48.1
Powered by blists - more mailing lists