[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250416131241.107903-2-phasta@kernel.org>
Date: Wed, 16 Apr 2025 15:12:11 +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 01/31] ASoC: sof: 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 surplus calls to PCI release functions, since pcim_ functions do
cleanup automatically.
Signed-off-by: Philipp Stanner <phasta@...nel.org>
---
sound/soc/sof/sof-pci-dev.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 2fc14b9a33d4..3d3282375827 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -216,7 +216,7 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
if (ret < 0)
return ret;
- ret = pci_request_regions(pci, "Audio DSP");
+ ret = pcim_request_all_regions(pci, "Audio DSP");
if (ret < 0)
return ret;
@@ -240,8 +240,7 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
path_override->ipc_type = sof_pci_ipc_type;
} else {
dev_err(dev, "Invalid IPC type requested: %d\n", sof_pci_ipc_type);
- ret = -EINVAL;
- goto out;
+ return -EINVAL;
}
path_override->fw_path = fw_path;
@@ -273,10 +272,6 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
/* call sof helper for DSP hardware probe */
ret = snd_sof_device_probe(dev, sof_pdata);
-out:
- if (ret)
- pci_release_regions(pci);
-
return ret;
}
EXPORT_SYMBOL_NS(sof_pci_probe, "SND_SOC_SOF_PCI_DEV");
@@ -290,9 +285,6 @@ void sof_pci_remove(struct pci_dev *pci)
if (snd_sof_device_probe_completed(&pci->dev) &&
!(sof_pci_debug & SOF_PCI_DISABLE_PM_RUNTIME))
pm_runtime_get_noresume(&pci->dev);
-
- /* release pci regions and disable device */
- pci_release_regions(pci);
}
EXPORT_SYMBOL_NS(sof_pci_remove, "SND_SOC_SOF_PCI_DEV");
--
2.48.1
Powered by blists - more mailing lists