From nobody Fri Dec 19 18:52:37 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63592235354; Fri, 25 Apr 2025 08:17:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569078; cv=none; b=i8zk6eyISQbA1DwR+Gsy46OhQw8ZvWET2mphv1WYGWxViflGPcU90riJqP4k2LWAbxS0WGu2zhfWASonWQD2XpW7z3hQf7+X7WPRAeMeYLmoxGgI3LxAm/wrO2nN7cOhAW4/+jxj++ayd9qvZra4oMjeWoqR7A8ndgJ0VVmacbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569078; c=relaxed/simple; bh=dIsIfNWPh4pCz7BGWzAp5hEA101BvYn+yM42BX3fm/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ILXJDX+hFE9lQ6qbHJzVu6XcJt3qeUHGYCwR742DCW6XX1AUxpNIpRhdFxu1NTtgylvDc/MzagCAAShhLQ53k+H7zg8e9r871idRu8Hq/vJpwjsrH/j8PSZGie66XsmipheosZgpKVALs0MvY8NqAZ9jO9B/HQTUhIM9c8pFnIQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GlQcK00e; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GlQcK00e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D6FAC4CEE4; Fri, 25 Apr 2025 08:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745569077; bh=dIsIfNWPh4pCz7BGWzAp5hEA101BvYn+yM42BX3fm/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GlQcK00ex9c+3BjQc/0nVKEIU3/rknFLInQP4eRYbNtNy9VM1EHV/ISH6rtmKBmsG xalKn78G8U1pdamgvJi+ombtaJUZtZfUNtRo21GsDAJCrOgB07nwBR1+EcGR/B2xGw 8eVwUIf6HGxsYgVEUR4B3zSeVZjDKQSeJESpk3cJ3TQGDGLuyhWBJAbZZU1xB9SvX0 /PcesbOMue+77zyHg29xEjI2oNV2+Ida8udoPQYEvd89SLDYsZTI3QphgimOl3Zo5N wabpOUsseaL8hii5RCKhREAL5nKCElDb9W+xn2uj3342UzdtcAfyIIPysS9ejPby/7 h/QCXuKaSl11g== From: Philipp Stanner To: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Jaroslav Kysela , Takashi Iwai , Daniel Baluta , Philipp Stanner , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Damien Le Moal , Andy Shevchenko Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v3 1/4] ASoC: sof: Use pure devres PCI Date: Fri, 25 Apr 2025 10:17:40 +0200 Message-ID: <20250425081742.61623-3-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425081742.61623-2-phasta@kernel.org> References: <20250425081742.61623-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- sound/soc/sof/sof-pci-dev.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 2fc14b9a33d4..c50249aadea9 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; =20 - ret =3D pci_request_regions(pci, "Audio DSP"); + ret =3D pcim_request_all_regions(pci, "Audio DSP"); if (ret < 0) return ret; =20 @@ -240,8 +240,7 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci= _device_id *pci_id) path_override->ipc_type =3D sof_pci_ipc_type; } else { dev_err(dev, "Invalid IPC type requested: %d\n", sof_pci_ipc_type); - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 path_override->fw_path =3D fw_path; @@ -271,13 +270,7 @@ int sof_pci_probe(struct pci_dev *pci, const struct pc= i_device_id *pci_id) sof_pdata->sof_probe_complete =3D sof_pci_probe_complete; =20 /* call sof helper for DSP hardware probe */ - ret =3D snd_sof_device_probe(dev, sof_pdata); - -out: - if (ret) - pci_release_regions(pci); - - return ret; + return snd_sof_device_probe(dev, sof_pdata); } EXPORT_SYMBOL_NS(sof_pci_probe, "SND_SOC_SOF_PCI_DEV"); =20 @@ -290,9 +283,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"); =20 --=20 2.48.1 From nobody Fri Dec 19 18:52:37 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E6372356A4; Fri, 25 Apr 2025 08:18:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569083; cv=none; b=oTzeddf2c00g4ns0eaXlBR7LZtGt8ESgfGMAlReKPCPNWffD3fUKRxsAFqATqz1S8CTO71J34XjFHDXNPkubrYQZAQXgshF9GWAjdDh65LDWlryzsF2T2PcNTfAxc5ij74hL88lLvrorpRI2uzuDuWGWYZSVlYYTFDvaqFTKPb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569083; c=relaxed/simple; bh=Q7F5o8AVhR4zCIu34F9b0xfiGNI6jZVtQ88rTFRCmfQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IN4z5ZU8SEhGdY9GW6zeJsht+NlEjhEcMk0HCiTo0FHpfF3mEmRhOHq6IP+4/CzlntVHFg9yNXCxxxhPvBEb+6C2dvJie1mbQyE4k3LyGNFyJugUUqMqtp3ngUvdB5EB2nmohVDb9yMKAoZOoni3ZwBYHAB7SRtYgIaJJbiIV1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JmlmR3RU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JmlmR3RU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B722C4CEEA; Fri, 25 Apr 2025 08:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745569082; bh=Q7F5o8AVhR4zCIu34F9b0xfiGNI6jZVtQ88rTFRCmfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JmlmR3RUGsRb4c65c4O7IpQUXHZGK0oFAsFll/hEN2w7a+SHx3M2F64yLy5Ik2wOw xF+43QeV7spXkQkJZj9mq6CztDaa4oBclbHpSoBvEWH2jZ9f2XEDKUhrXYivmhxEEH ISGi1TkhXAIQ4CihiH5VMHgy2wgWBSKfS7yX3ZMBaviXgXy4jQcE+loTFWSizp7KFq reQvtVwgumwEmgdVNOttUCS5UmpNdw10EwsdMmUmg7R5BjYKLWKDqhiRVt/tMJ/O+n xs0UxSPfSaD7pKnFswy4kqBbucE1zm2tPWY/vAY+TgLIj4kowaYVMflK9fQnSBMR74 rHCjbZKZ/0fvQ== From: Philipp Stanner To: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Jaroslav Kysela , Takashi Iwai , Daniel Baluta , Philipp Stanner , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Damien Le Moal , Andy Shevchenko Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v3 2/4] ASoC: intel: avs: Use pure devres PCI Date: Fri, 25 Apr 2025 10:17:41 +0200 Message-ID: <20250425081742.61623-4-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425081742.61623-2-phasta@kernel.org> References: <20250425081742.61623-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- sound/soc/intel/avs/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index 8fbf33e30dfc..8f15a65406cd 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 str= uct pci_device_id *id) return ret; } =20 - ret =3D pci_request_regions(pci, "AVS HDAudio"); + ret =3D pcim_request_all_regions(pci, "AVS HDAudio"); if (ret < 0) return ret; =20 @@ -454,8 +454,7 @@ static int avs_pci_probe(struct pci_dev *pci, const str= uct pci_device_id *id) bus->remap_addr =3D pci_ioremap_bar(pci, 0); if (!bus->remap_addr) { dev_err(bus->dev, "ioremap error\n"); - ret =3D -ENXIO; - goto err_remap_bar0; + return -ENXIO; } =20 adev->dsp_ba =3D pci_ioremap_bar(pci, 4); @@ -512,8 +511,6 @@ static int avs_pci_probe(struct pci_dev *pci, const str= uct pci_device_id *id) iounmap(adev->dsp_ba); err_remap_bar4: iounmap(bus->remap_addr); -err_remap_bar0: - pci_release_regions(pci); return ret; } =20 @@ -584,7 +581,6 @@ static void avs_pci_remove(struct pci_dev *pci) pci_free_irq_vectors(pci); iounmap(bus->remap_addr); iounmap(adev->dsp_ba); - pci_release_regions(pci); =20 /* Firmware is not needed anymore */ avs_release_firmwares(adev); --=20 2.48.1 From nobody Fri Dec 19 18:52:37 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AD5E2356C7; Fri, 25 Apr 2025 08:18:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569087; cv=none; b=VLjLY8KBDn/62Ofg7OL57teHjvSNy0Zrbr3TDjj9EmX1rhdJIBjkQ0x2lHbRx/f0ZW161rOZC9M25OcaVTpowMLIVzqd1PBAdzcbANmJNnyLgGr8ZhXoxfQgquEKsBZcofA60JZw3JVpP1T5PRl0ytuo6H3zi+DKbriL58n8yY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569087; c=relaxed/simple; bh=awlsyWniRYN33HA6T5LMHEhBqINnT7MkKK/HVcaeYj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EjGY0UBPjNpIBJRk6pWbQiNL+uvwDW9/2jSy/XEE+643+H62Qpzhlf65yukBVALgyOC306Nyk64iWAIGaRmd/1GPdoHGUPN0ZFGi4dG/r5ORzsqwA+PUw8wptJs3ahFS5md4Rqc18yfi4Gr2KzpcaKladvnYEyFY1vOjft7Q9aM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XEmReszk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XEmReszk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DF87C4CEE4; Fri, 25 Apr 2025 08:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745569087; bh=awlsyWniRYN33HA6T5LMHEhBqINnT7MkKK/HVcaeYj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XEmReszkyNQwwmdAO5OadikL0bbOX6qLbQ3PfET5+lVL7L61pg2k2P6+aE9Sh8v/s RGJlz+t+W/hwrAgsTjwlyRH5dovYPo6yJrsmD/JPF6UzB7++rJ8Y4QPfWj7nb37UJl cq1VUjvN2RwSmaagRT4LMg5jAIlIM4Tq6UHNaoSGe0ROnTJBG2NDFHyVXIhtThe6ZU mNn8wUkQqLY+JliOCYM5EYyWm+CM8IWOxFVgLv9f4/E5jwdWJFs9KyWwcR+560iIqh wcwDx0O0M/Om45LH4OmF3ndECHT9jjGICtvvQJaPDu2Q+whpEdoa07T+ZU0UO9SWgO 1Oguy2HM0Ngdw== From: Philipp Stanner To: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Jaroslav Kysela , Takashi Iwai , Daniel Baluta , Philipp Stanner , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Damien Le Moal , Andy Shevchenko Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v3 3/4] AsoC: intel: atom: Use pure devres PCI Date: Fri, 25 Apr 2025 10:17:42 +0200 Message-ID: <20250425081742.61623-5-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425081742.61623-2-phasta@kernel.org> References: <20250425081742.61623-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 call to pci_release_regions(), since pcim_ functions do cleanup automatically. Pass 0 as length parameter to pcim_iomap(), which is the standard way for ioremapping an entire BAR. Signed-off-by: Philipp Stanner --- sound/soc/intel/atom/sst/sst_pci.c | 59 ++++++++++++------------------ 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_pci.c b/sound/soc/intel/atom/sst/= sst_pci.c index d1e64c3500be..bf2330e6f5a4 100644 --- a/sound/soc/intel/atom/sst/sst_pci.c +++ b/sound/soc/intel/atom/sst/sst_pci.c @@ -26,7 +26,7 @@ static int sst_platform_get_resources(struct intel_sst_dr= v *ctx) int ddr_base, ret =3D 0; struct pci_dev *pci =3D ctx->pci; =20 - ret =3D pci_request_regions(pci, SST_DRV_NAME); + ret =3D pcim_request_all_regions(pci, SST_DRV_NAME); if (ret) return ret; =20 @@ -38,67 +38,57 @@ static int sst_platform_get_resources(struct intel_sst_= drv *ctx) ddr_base =3D relocate_imr_addr_mrfld(ctx->ddr_base); if (!ctx->pdata->lib_info) { dev_err(ctx->dev, "lib_info pointer NULL\n"); - ret =3D -EINVAL; - goto do_release_regions; + return -EINVAL; } if (ddr_base !=3D ctx->pdata->lib_info->mod_base) { dev_err(ctx->dev, "FW LSP DDR BASE does not match with IFWI\n"); - ret =3D -EINVAL; - goto do_release_regions; + return -EINVAL; } ctx->ddr_end =3D pci_resource_end(pci, 0); =20 - ctx->ddr =3D pcim_iomap(pci, 0, - pci_resource_len(pci, 0)); - if (!ctx->ddr) { - ret =3D -EINVAL; - goto do_release_regions; - } + ctx->ddr =3D pcim_iomap(pci, 0, 0); + if (!ctx->ddr) + return -EINVAL; + dev_dbg(ctx->dev, "sst: DDR Ptr %p\n", ctx->ddr); } else { ctx->ddr =3D NULL; } /* SHIM */ ctx->shim_phy_add =3D pci_resource_start(pci, 1); - ctx->shim =3D pcim_iomap(pci, 1, pci_resource_len(pci, 1)); - if (!ctx->shim) { - ret =3D -EINVAL; - goto do_release_regions; - } + ctx->shim =3D pcim_iomap(pci, 1, 0); + if (!ctx->shim) + return -EINVAL; + dev_dbg(ctx->dev, "SST Shim Ptr %p\n", ctx->shim); =20 /* Shared SRAM */ ctx->mailbox_add =3D pci_resource_start(pci, 2); - ctx->mailbox =3D pcim_iomap(pci, 2, pci_resource_len(pci, 2)); - if (!ctx->mailbox) { - ret =3D -EINVAL; - goto do_release_regions; - } + ctx->mailbox =3D pcim_iomap(pci, 2, 0); + if (!ctx->mailbox) + return -EINVAL; + dev_dbg(ctx->dev, "SRAM Ptr %p\n", ctx->mailbox); =20 /* IRAM */ ctx->iram_end =3D pci_resource_end(pci, 3); ctx->iram_base =3D pci_resource_start(pci, 3); - ctx->iram =3D pcim_iomap(pci, 3, pci_resource_len(pci, 3)); - if (!ctx->iram) { - ret =3D -EINVAL; - goto do_release_regions; - } + ctx->iram =3D pcim_iomap(pci, 3, 0); + if (!ctx->iram) + return -EINVAL; + dev_dbg(ctx->dev, "IRAM Ptr %p\n", ctx->iram); =20 /* DRAM */ ctx->dram_end =3D pci_resource_end(pci, 4); ctx->dram_base =3D pci_resource_start(pci, 4); - ctx->dram =3D pcim_iomap(pci, 4, pci_resource_len(pci, 4)); - if (!ctx->dram) { - ret =3D -EINVAL; - goto do_release_regions; - } + ctx->dram =3D pcim_iomap(pci, 4, 0); + if (!ctx->dram) + return -EINVAL; + dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram); -do_release_regions: - pci_release_regions(pci); - return ret; + return 0; } =20 /* @@ -167,7 +157,6 @@ static void intel_sst_remove(struct pci_dev *pci) =20 sst_context_cleanup(sst_drv_ctx); pci_dev_put(sst_drv_ctx->pci); - pci_release_regions(pci); pci_set_drvdata(pci, NULL); } =20 --=20 2.48.1 From nobody Fri Dec 19 18:52:37 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93B252356A6; Fri, 25 Apr 2025 08:18:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569092; cv=none; b=mSlfMQWe60+ZeaWF0mTXiCxwTB/F8JKoFfb6F6u3V8GJDU5+Rv/m1m+zf/09M3udsh17XIfpVKl1nQ5z8IV4GLWx+GPaHsfhca23Cup3qLIoircdCeZa+hLw/HBBE4NAa0v41nRH05srVe3qWeJTl5LDYeF2dGERLz2ewOBrtio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745569092; c=relaxed/simple; bh=vBvwTngtF1y3gEmzsBG3Ole+k2+llV0wO5j1OWtz3cU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Av4jdjC03x1ReIOKARbBt3loTBM4SiFEZi3gKu4Hw145bLGA1z+M0hQ12Y1ETP6Ezjlv7M9YOo1wPJo6riz0fL6FVUSW4P1G9Rmbv8ZkuO29WBTy+9aJvv4EW+paynFfMQ925BcMPXQHRMTPF15UB8KQbQcYsqoUat3esojJ+eA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s2dqp/1Z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s2dqp/1Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB43CC4CEE4; Fri, 25 Apr 2025 08:18:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745569092; bh=vBvwTngtF1y3gEmzsBG3Ole+k2+llV0wO5j1OWtz3cU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s2dqp/1ZtDMF0/3m2Sgj/JqnJpL1j3Fa5gTBKgtpqy4pAYukdZiVnJcPm95z067J/ gVTGpWxG6Om5uwtxnptI1fV5MXhajBk3q1WvLCU6oZXyLidfIp9BDLKhn3St0IuxVM gNvRHn3xhRsNLqx/M6/WxEhN1IWtXWjldZq8fqf9y/NVL7XFcISVYh0ceu0rGLxcIs RoVsiYBS1bGEP3VdHJ9Rg5h4b+qw4VvVkzVZ4arssf7HxFflWioLqg+mipGTW35drH ZIu7ntFfgIDynQHBgsD6dsDKj76aLkrCa1kiRpVvXXznTtQjpvHGr9SBZ5WnqksS49 v7cF3FaDRbbXg== From: Philipp Stanner To: Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Pierre-Louis Bossart , Mark Brown , Jaroslav Kysela , Takashi Iwai , Daniel Baluta , Philipp Stanner , =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= , Damien Le Moal , Andy Shevchenko Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v3 4/4] AsoC: intel: atom: Return -ENOMEM if pcim_iomap() fails Date: Fri, 25 Apr 2025 10:17:43 +0200 Message-ID: <20250425081742.61623-6-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250425081742.61623-2-phasta@kernel.org> References: <20250425081742.61623-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The error checks for pcim_iomap() have the function return -EINVAL. -ENOMEM is a more appropriate error code. Replace -EINVAL with -ENOMEM. Signed-off-by: Philipp Stanner Reviewed-by: Cezary Rojewski --- sound/soc/intel/atom/sst/sst_pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_pci.c b/sound/soc/intel/atom/sst/= sst_pci.c index bf2330e6f5a4..22ae2d22f121 100644 --- a/sound/soc/intel/atom/sst/sst_pci.c +++ b/sound/soc/intel/atom/sst/sst_pci.c @@ -49,7 +49,7 @@ static int sst_platform_get_resources(struct intel_sst_dr= v *ctx) =20 ctx->ddr =3D pcim_iomap(pci, 0, 0); if (!ctx->ddr) - return -EINVAL; + return -ENOMEM; =20 dev_dbg(ctx->dev, "sst: DDR Ptr %p\n", ctx->ddr); } else { @@ -59,7 +59,7 @@ static int sst_platform_get_resources(struct intel_sst_dr= v *ctx) ctx->shim_phy_add =3D pci_resource_start(pci, 1); ctx->shim =3D pcim_iomap(pci, 1, 0); if (!ctx->shim) - return -EINVAL; + return -ENOMEM; =20 dev_dbg(ctx->dev, "SST Shim Ptr %p\n", ctx->shim); =20 @@ -67,7 +67,7 @@ static int sst_platform_get_resources(struct intel_sst_dr= v *ctx) ctx->mailbox_add =3D pci_resource_start(pci, 2); ctx->mailbox =3D pcim_iomap(pci, 2, 0); if (!ctx->mailbox) - return -EINVAL; + return -ENOMEM; =20 dev_dbg(ctx->dev, "SRAM Ptr %p\n", ctx->mailbox); =20 @@ -76,7 +76,7 @@ static int sst_platform_get_resources(struct intel_sst_dr= v *ctx) ctx->iram_base =3D pci_resource_start(pci, 3); ctx->iram =3D pcim_iomap(pci, 3, 0); if (!ctx->iram) - return -EINVAL; + return -ENOMEM; =20 dev_dbg(ctx->dev, "IRAM Ptr %p\n", ctx->iram); =20 @@ -85,7 +85,7 @@ static int sst_platform_get_resources(struct intel_sst_dr= v *ctx) ctx->dram_base =3D pci_resource_start(pci, 4); ctx->dram =3D pcim_iomap(pci, 4, 0); if (!ctx->dram) - return -EINVAL; + return -ENOMEM; =20 dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram); return 0; --=20 2.48.1