[PATCH v2 4/4] AsoC: intel/atom: Return -ENOMEM if pcim_iomap() fails

Philipp Stanner posted 4 patches 8 months ago
There is a newer version of this series
[PATCH v2 4/4] AsoC: intel/atom: Return -ENOMEM if pcim_iomap() fails
Posted by Philipp Stanner 8 months ago
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 <phasta@kernel.org>
---
 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_drv *ctx)
 
 		ctx->ddr = pcim_iomap(pci, 0, 0);
 		if (!ctx->ddr)
-			return -EINVAL;
+			return -ENOMEM;
 
 		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_drv *ctx)
 	ctx->shim_phy_add = pci_resource_start(pci, 1);
 	ctx->shim = pcim_iomap(pci, 1, 0);
 	if (!ctx->shim)
-		return -EINVAL;
+		return -ENOMEM;
 
 	dev_dbg(ctx->dev, "SST Shim Ptr %p\n", ctx->shim);
 
@@ -67,7 +67,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
 	ctx->mailbox_add = pci_resource_start(pci, 2);
 	ctx->mailbox = pcim_iomap(pci, 2, 0);
 	if (!ctx->mailbox)
-		return -EINVAL;
+		return -ENOMEM;
 
 	dev_dbg(ctx->dev, "SRAM Ptr %p\n", ctx->mailbox);
 
@@ -76,7 +76,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
 	ctx->iram_base = pci_resource_start(pci, 3);
 	ctx->iram = pcim_iomap(pci, 3, 0);
 	if (!ctx->iram)
-		return -EINVAL;
+		return -ENOMEM;
 
 	dev_dbg(ctx->dev, "IRAM Ptr %p\n", ctx->iram);
 
@@ -85,7 +85,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
 	ctx->dram_base = pci_resource_start(pci, 4);
 	ctx->dram = pcim_iomap(pci, 4, 0);
 	if (!ctx->dram)
-		return -EINVAL;
+		return -ENOMEM;
 
 	dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram);
 	return 0;
-- 
2.48.1
Re: [PATCH v2 4/4] AsoC: intel/atom: Return -ENOMEM if pcim_iomap() fails
Posted by Cezary Rojewski 8 months ago
On 2025-04-23 10:28 AM, Philipp Stanner wrote:
> The error checks for pcim_iomap() have the function return -EINVAL.
> -ENOMEM is a more appropriate error code.
> 
> Replace -EINVAL with -ENOMEM.
Nitpicks:

I believe the last sentence is redundant, the title and the message say 
it all.

Next, the suggest scope for the atom-driver is: 'ASoC: Intel: atom:'.

> Signed-off-by: Philipp Stanner <phasta@kernel.org>
> ---
>   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_drv *ctx)
>   
>   		ctx->ddr = pcim_iomap(pci, 0, 0);
>   		if (!ctx->ddr)
> -			return -EINVAL;
> +			return -ENOMEM;
>   
>   		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_drv *ctx)
>   	ctx->shim_phy_add = pci_resource_start(pci, 1);
>   	ctx->shim = pcim_iomap(pci, 1, 0);
>   	if (!ctx->shim)
> -		return -EINVAL;
> +		return -ENOMEM;
>   
>   	dev_dbg(ctx->dev, "SST Shim Ptr %p\n", ctx->shim);
>   
> @@ -67,7 +67,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
>   	ctx->mailbox_add = pci_resource_start(pci, 2);
>   	ctx->mailbox = pcim_iomap(pci, 2, 0);
>   	if (!ctx->mailbox)
> -		return -EINVAL;
> +		return -ENOMEM;
>   
>   	dev_dbg(ctx->dev, "SRAM Ptr %p\n", ctx->mailbox);
>   
> @@ -76,7 +76,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
>   	ctx->iram_base = pci_resource_start(pci, 3);
>   	ctx->iram = pcim_iomap(pci, 3, 0);
>   	if (!ctx->iram)
> -		return -EINVAL;
> +		return -ENOMEM;
>   
>   	dev_dbg(ctx->dev, "IRAM Ptr %p\n", ctx->iram);
>   
> @@ -85,7 +85,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
>   	ctx->dram_base = pci_resource_start(pci, 4);
>   	ctx->dram = pcim_iomap(pci, 4, 0);
>   	if (!ctx->dram)
> -		return -EINVAL;
> +		return -ENOMEM;
>   
>   	dev_dbg(ctx->dev, "DRAM Ptr %p\n", ctx->dram);
>   	return 0;


Hi Philipp,

Thanks for the patch, this is certainly an additional effort, on top of 
the pcim_xxx one. Couple of nitpicks above but nothing major. Regardless 
if you decide to address them or not, feel free to add:

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>