From nobody Fri Dec 19 16:04:50 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 49057275853; Wed, 23 Apr 2025 08:29:19 +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=1745396961; cv=none; b=WlhbNk/3ptYAGMT8sWDi2rA3GnjSX8IWPGaWjtimVMbl0yub1gxIStvJH3OJn6GDwieJCeTHoN6wkuzHBXOOZYFbsHOxhTz5USjqGjz05fqFF7IyzKP/4FCl5GBgr47RpIkS0qvgeAaAeiVadPPKUNTsAUzFcvlUux2ZKtpwC1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745396961; c=relaxed/simple; bh=dIsIfNWPh4pCz7BGWzAp5hEA101BvYn+yM42BX3fm/A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kZVpexzxd22F5jb736Kzoii1PYwNt6/tkIPSIDGNV/De+g2pZRP2Dv80boFqRB3XM1si5tq5KNDRy6Ygf04GqFVBKIK8CclMRUbgtx6nGHYtnTsff6HCrieRpoRjxdcPfTtdwyKlNuw2TKVZLwkehnIH2Gd1gWVHtM1pX9hNJBY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JUtMnaLh; 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="JUtMnaLh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34382C4CEEA; Wed, 23 Apr 2025 08:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396959; bh=dIsIfNWPh4pCz7BGWzAp5hEA101BvYn+yM42BX3fm/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JUtMnaLhNzJcrNzjghx6mmWbAk396LVjPRzmYciufIkA87yaxMp9Hy4WZw4l34Efh YSdwCN3iIOcGlFngxPXRtHKv0WD/7fk29yzwEceFVqTa3kQAOJEM8rNpcUoCYOlpzN jmSI1W93fbYXRDltiouirmNzj+kQoE+w4hkIh53gPKwVloD1Gi34JjTRvVwE8uKDN5 qUudTl7BGx3yuoG80dHhST7pFTbT26Szve6LC9W/OnDHoyAdnn7B8FbNK2jHcUNkg9 NJv5vr9Y2voT5SzgxHqcM2gcAc++5XcdpRjYMOoyzi9aGuJw7Kck7ZVq6irRb1pgTV 68R3QO8NVIGgg== 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?= , Charles Keepax , Damien Le Moal Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v2 1/4] ASoC: sof: Use pure devres PCI Date: Wed, 23 Apr 2025 10:28:56 +0200 Message-ID: <20250423082858.49780-3-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250423082858.49780-2-phasta@kernel.org> References: <20250423082858.49780-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 Reviewed-by: Cezary Rojewski --- 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 16:04:50 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 79B93275853; Wed, 23 Apr 2025 08:29:25 +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=1745396965; cv=none; b=ECHM4PpmwNbP1mGvx/2uj86vrxSKBSq81ApWHfRyXATskLV9pMEauegcwwwZTzcGcKDGb8Ys9DgWasse2SGkoiUxpJ8aV3EVU55mXNNGM3BDx/yVsboVLxl5LLEV0NOxCILDcOq0BwNhJuiZFIw7gLMmtL7uHatUYWWbapHEjrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745396965; c=relaxed/simple; bh=gpb1Vl3zMc7v2AN2uXCdpJ78JEE37uEZ4vxk3DO8D9A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fixdqm7auR/YsXvkNu1gPtlZt18xTpYl3fkqmY75eSPCgorAWfic451jfQfwc/77dITwkIqqsMQ8cud0uPk6do8z5KmuS0gUL4UIf2aG1B7epDvh2age9+BUJtVf1vRim50mcTmY4+5m1E0ik7Tr5WLq23/+BsCioqCHsLpvXxo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YbPDbZMY; 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="YbPDbZMY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 519CDC4CEE2; Wed, 23 Apr 2025 08:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396965; bh=gpb1Vl3zMc7v2AN2uXCdpJ78JEE37uEZ4vxk3DO8D9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YbPDbZMY3vrbRVhtzbHYKnMhxhI1ufVfwxyFi0qtaNokLvFlsHa0O+1rjKvcZ18Pp rU0zGuLhEs+aZ02cmJAczE87huvVdJT62MIbeT0yjoMcOd38F04X+6nsfCsSFHcpji ACs3vXcDLbQN/3d/hC3fdmY3pY09pskBPGqswjKS8+E8hfPpUEP3Ap4BOLj5pugyn5 4dAVjCNXd5u1nFfxCejo0+Xw8QCmV3NdmYSs5lLGJP6Vx3yZ/kRZf/u65pecj7Km5M zqm5O8LNIaZvrm9GhbQHBCjzDrzMaNYTs6SDhs1iXU2LCiFwLtcVKzjl+wbtv5haGl RlVw9I8Zj7IFg== 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?= , Charles Keepax , Damien Le Moal Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v2 2/4] ASoC: intel/avs: Use pure devres PCI Date: Wed, 23 Apr 2025 10:28:57 +0200 Message-ID: <20250423082858.49780-4-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250423082858.49780-2-phasta@kernel.org> References: <20250423082858.49780-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 Reviewed-by: Cezary Rojewski --- 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 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 --=20 2.48.1 From nobody Fri Dec 19 16:04:50 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 C5EEE27702E; Wed, 23 Apr 2025 08:29:30 +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=1745396970; cv=none; b=AZJmu8TroM96h9Ldcq+4A5shmbCGX0wtK4et31YWxr919yQVYKtIGxinMnptvQsUj3E85hs/71WTV9KRlAzwOWYynd6tOnLPlYBCHEM/Utn5dDgdCctKEKAK0QNrgLD2Vi1gF5sdZdyiHkXe32JlJ5abIUAfa1K6GPtXrTqRda4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745396970; c=relaxed/simple; bh=cus0OmFcFt1BXBWMT7QS3EfOZuq5LaYdJToDhh6P5BQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RDrxcGXYyK2zvBhasvI7+yyTIl2z7vHdj+B5OqaDB1rh+h/HorKvB9cyiqmO04zWtCFIeHnrDR0TVIdSUpSs8Sxl19r9AfMAz+XlVBFg5e+Ou7juV1wS4/8eOaxKzq2iuImeW4xkdw9pPIADHEg43e4NkYNM6CVjB5DJwVDD0Gc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cWQwT6gE; 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="cWQwT6gE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77668C4CEEA; Wed, 23 Apr 2025 08:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396970; bh=cus0OmFcFt1BXBWMT7QS3EfOZuq5LaYdJToDhh6P5BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cWQwT6gEnVuDT2CpWyI2ghYNQq5Z0uSbmCQF1c57iSWkSIF6BNDVohvHg/51A76vV xQXmJNvO30+rLiD8gkQQPCB3X184WK4IWtw/2Gz4SCz1+YKNyIquFPqq6wiJL5R5PP TdIl1F5RkS2wmrsaIXlXstE7Th8ZXNousOs8zbPIXg/RjgAKjg+ETw7xD2WfWwTBsi yLDrqxE9Vl/Mm59IHupv8pNZbLWGIPnd+toXI9NVth/SAw37HnWLDaakSIuoNbl85L a6naGRooH8Se99TPRcEwF5NMfTu5irPq50IHJNEGJeuCtGWbqMIfm780//SAJBHqmZ 8XuwDGjlkdGjw== 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?= , Charles Keepax , Damien Le Moal Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v2 3/4] AsoC: intel/atom: Use pure devres PCI Date: Wed, 23 Apr 2025 10:28:58 +0200 Message-ID: <20250423082858.49780-5-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250423082858.49780-2-phasta@kernel.org> References: <20250423082858.49780-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 Reviewed-by: Cezary Rojewski --- sound/soc/intel/atom/sst/sst_pci.c | 58 +++++++++++++----------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst_pci.c b/sound/soc/intel/atom/sst/= sst_pci.c index d1e64c3500be..eadcf24cbdc3 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 /* --=20 2.48.1 From nobody Fri Dec 19 16:04:50 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 B2E94278168; Wed, 23 Apr 2025 08:29:35 +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=1745396975; cv=none; b=HoiDJjNpSWJrokKj3dHNmY+rmHlXFf2R/awqk+gejSxMNcJ2Hps1hAk9twkHqiNDvRSdy91mpVLuaMN4q97/qeRpS619gc3F1YEO00L4W2Nm4Fg+6/p4YL91nWu65CvLRZRFVlF7LnVDeU40Xljas5iakwQGDzomxd2TeixVSik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745396975; c=relaxed/simple; bh=5iBHc7VgEn5shkIz3z0HxP6l4p3zz5y59kKncMVQ9FE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N59fEtSEYjpWuG3obcM069HKadn/jfS/aIzMQQSgAqaY0GqnWR1NYVHrR7OVaVI2uc+VupAbY7Ggjqx6lGSR0jqeKWsliAHZnFn9ZYjc3UOEKLBfe6D9digD2xtmXIVwfzI+NMsuNPoKIkAnFKSKUg8nWfaw/XXdrea6GSVmLXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MWEp5iG8; 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="MWEp5iG8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A351C4CEE2; Wed, 23 Apr 2025 08:29:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396975; bh=5iBHc7VgEn5shkIz3z0HxP6l4p3zz5y59kKncMVQ9FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MWEp5iG89G9HmLH0sN+9p4XixP1rEH2MtZ0lV+xfbZ+tWOIJdrUeFL7wJMzhrawFU wkPZVJIL+G5RzSQbCmoAwP1NpsjMb7jJ4a6QBkkoCTti1UZi7Tmw8DS3ZhEzU1GbET 8z4xRKpWLURGC4txZBj8na4YABwkrq8C5qPs9KBgI6s+0UhCCFLa8JEHveNchiL5NN eNYjaZm++cKad1d1NSRrTfvtdkKdxwok/3tiEQffsFQL18KjKAq/qW6uODo0vIHaf8 czBtfCW9wSjeSuTRf2kXLbN5+T2xeVhHyPipKEmX+9l52TErgdrwDYka2xNs1o9LoQ h6pQ772/T4iSw== 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?= , Charles Keepax , Damien Le Moal Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH v2 4/4] AsoC: intel/atom: Return -ENOMEM if pcim_iomap() fails Date: Wed, 23 Apr 2025 10:28:59 +0200 Message-ID: <20250423082858.49780-6-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250423082858.49780-2-phasta@kernel.org> References: <20250423082858.49780-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 eadcf24cbdc3..edc86519816d 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