[PATCH 1/5 v4] ASoC: ep93xx-ac97: Fix platform_get_irq's error checking

[PATCH 1/5 v4] ASoC: ep93xx-ac97: Fix platform_get_irq's error checking

[Arvind Yadav]

The platform_get_irq() function returns negative if an error occurs.
zero or positive number on success. platform_get_irq() error checking
for zero is not correct.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
changes in v2 :
               irq was unsigned. so changed it to signed.
changes in v3 :
              Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
changes in v4 :
              Return -ENODEV insted of irq.

 sound/soc/cirrus/ep93xx-ac97.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index bbf7a92..efeecee 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -365,7 +365,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
 {
 	struct ep93xx_ac97_info *info;
 	struct resource *res;
-	unsigned int irq;
+	int irq;
 	int ret;
 
 	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
@@ -378,7 +378,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
 		return PTR_ERR(info->regs);
 
 	irq = platform_get_irq(pdev, 0);
-	if (!irq)
+	if (irq <= 0)
 		return -ENODEV;
 
 	ret = devm_request_irq(&pdev->dev, irq, ep93xx_ac97_interrupt,
-- 
2.7.4

[PATCH 2/5 v4] ASoC: mt8173: Fix platform_get_irq's error checking

[Arvind Yadav]

The platform_get_irq() function returns negative if an error occurs.
zero or positive number on success. platform_get_irq() error checking
for zero is not correct.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
changes in v2 :
               irq was unsigned. so changed it to signed.
changes in v3 :
              Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
changes in v4 :
              Return -ENODEV insted of irq_id.

 sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
index 8a643a3..1153566 100644
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -1083,7 +1083,7 @@ static int mt8173_afe_init_audio_clk(struct mtk_base_afe *afe)
 static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 {
 	int ret, i;
-	unsigned int irq_id;
+	int irq_id;
 	struct mtk_base_afe *afe;
 	struct mt8173_afe_private *afe_priv;
 	struct resource *res;
@@ -1105,7 +1105,7 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 	afe->dev = &pdev->dev;
 
 	irq_id = platform_get_irq(pdev, 0);
-	if (!irq_id) {
+	if (irq_id <= 0) {
 		dev_err(afe->dev, "np %s no irq\n", afe->dev->of_node->name);
 		return -ENXIO;
 	}
-- 
2.7.4

[PATCH 3/5 v4] ASoC: nuc900: Fix platform_get_irq's error checking

[Arvind Yadav]

The platform_get_irq() function returns negative if an error occurs.
zero or positive number on success. platform_get_irq() error checking
for zero is not correct.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
changes in v2 :
               irq was unsigned. so using signed variable ret.
changes in v3 :
              Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
changes in v4 :
              Return -ENODEV insted of irq.
 sound/soc/nuc900/nuc900-ac97.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index b6615af..893ccf2 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -345,11 +345,12 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
 		goto out;
 	}
 
-	nuc900_audio->irq_num = platform_get_irq(pdev, 0);
-	if (!nuc900_audio->irq_num) {
+	ret = platform_get_irq(pdev, 0);
+	if (ret <= 0) {
 		ret = -EBUSY;
 		goto out;
 	}
+	nuc900_audio->irq_num = ret;
 
 	nuc900_ac97_data = nuc900_audio;
 
-- 
2.7.4

[PATCH 4/5 v3] ASoC: intel: sst: Handle return value of platform_get_irq

[Arvind Yadav]

platform_get_irq() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
changes in v2 :
              Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
changes in v3 :
              Return EIO insted of ctx->irq_num.

 sound/soc/intel/atom/sst/sst_acpi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c
index 32d6e02..5e46d06f 100644
--- a/sound/soc/intel/atom/sst/sst_acpi.c
+++ b/sound/soc/intel/atom/sst/sst_acpi.c
@@ -236,6 +236,9 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)
 	/* Find the IRQ */
 	ctx->irq_num = platform_get_irq(pdev,
 				ctx->pdata->res_info->acpi_ipc_irq_index);
+	if (ctx->irq_num <= 0)
+		return -EIO;
+
 	return 0;
 }
 
-- 
2.7.4

[PATCH 5/5 v3] ASoC: intel: mfld: Handle return value of platform_get_irq

[Arvind Yadav]

platform_get_irq() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
changes in v2 :
              Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
changes in v3 :
              Return EIO insted of ctx->irq_num.

 sound/soc/intel/boards/mfld_machine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/intel/boards/mfld_machine.c b/sound/soc/intel/boards/mfld_machine.c
index 6f44acf..c819210 100644
--- a/sound/soc/intel/boards/mfld_machine.c
+++ b/sound/soc/intel/boards/mfld_machine.c
@@ -372,6 +372,8 @@ static int snd_mfld_mc_probe(struct platform_device *pdev)
 
 	/* retrive the irq number */
 	irq = platform_get_irq(pdev, 0);
+	if (irq <= 0)
+		return -ENODEV;
 
 	/* audio interrupt base of SRAM location where
 	 * interrupts are stored by System FW */
-- 
2.7.4

Re: [alsa-devel] [PATCH 1/5 v4] ASoC: ep93xx-ac97: Fix platform_get_irq's error checking

[Alexandre Belloni]

On 19/11/2017 at 09:45:00 +0530, Arvind Yadav wrote:
> The platform_get_irq() function returns negative if an error occurs.
> zero or positive number on success. platform_get_irq() error checking
> for zero is not correct.
> 
> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
> ---
> changes in v2 :
>                irq was unsigned. so changed it to signed.
> changes in v3 :
>               Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
> changes in v4 :
>               Return -ENODEV insted of irq.
> 

To ensure this doesn't get applied: platform_get_irq can return
-EPROBE_DEFER and this must be handled properly.

(Or maybe this has never caused anything and never failed at all and
nobody cares).


>  sound/soc/cirrus/ep93xx-ac97.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
> index bbf7a92..efeecee 100644
> --- a/sound/soc/cirrus/ep93xx-ac97.c
> +++ b/sound/soc/cirrus/ep93xx-ac97.c
> @@ -365,7 +365,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
>  {
>  	struct ep93xx_ac97_info *info;
>  	struct resource *res;
> -	unsigned int irq;
> +	int irq;
>  	int ret;
>  
>  	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
> @@ -378,7 +378,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
>  		return PTR_ERR(info->regs);
>  
>  	irq = platform_get_irq(pdev, 0);
> -	if (!irq)
> +	if (irq <= 0)
>  		return -ENODEV;
>  
>  	ret = devm_request_irq(&pdev->dev, irq, ep93xx_ac97_interrupt,
> -- 
> 2.7.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

-- 
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Re: [alsa-devel] [PATCH 1/5 v4] ASoC: ep93xx-ac97: Fix platform_get_irq's error checking

[arvindY]

Hi,

On Monday 20 November 2017 07:07 PM, Alexandre Belloni wrote:
> On 19/11/2017 at 09:45:00 +0530, Arvind Yadav wrote:
>> The platform_get_irq() function returns negative if an error occurs.
>> zero or positive number on success. platform_get_irq() error checking
>> for zero is not correct.
>>
>> Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
>> ---
>> changes in v2 :
>>                 irq was unsigned. so changed it to signed.
>> changes in v3 :
>>                Add failure case '<= 0' instead of '< 0'. IRQ0 is not valid.
>> changes in v4 :
>>                Return -ENODEV insted of irq.
>>
> To ensure this doesn't get applied: platform_get_irq can return
> -EPROBE_DEFER and this must be handled properly.
>
> (Or maybe this has never caused anything and never failed at all and
> nobody cares).
Yes, you are right. We should retry to get an irq for device. But ASoC
  driver is not retrying. if platfore_get_irq() fail here, Driver is 
throwing an error.
and this patch is only to fix error checking which is not correct in 
Driver.

~arvind

>
>>   sound/soc/cirrus/ep93xx-ac97.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
>> index bbf7a92..efeecee 100644
>> --- a/sound/soc/cirrus/ep93xx-ac97.c
>> +++ b/sound/soc/cirrus/ep93xx-ac97.c
>> @@ -365,7 +365,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
>>   {
>>   	struct ep93xx_ac97_info *info;
>>   	struct resource *res;
>> -	unsigned int irq;
>> +	int irq;
>>   	int ret;
>>   
>>   	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
>> @@ -378,7 +378,7 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
>>   		return PTR_ERR(info->regs);
>>   
>>   	irq = platform_get_irq(pdev, 0);
>> -	if (!irq)
>> +	if (irq <= 0)
>>   		return -ENODEV;
>>   
>>   	ret = devm_request_irq(&pdev->dev, irq, ep93xx_ac97_interrupt,
>> -- 
>> 2.7.4
>>
>> _______________________________________________
>> Alsa-devel mailing list
>> Alsa-devel@alsa-project.org
>> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [alsa-devel] [PATCH 1/5 v4] ASoC: ep93xx-ac97: Fix platform_get_irq's error checking

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 918 bytes --]

On Mon, Nov 20, 2017 at 09:31:40PM +0530, arvindY wrote:
> On Monday 20 November 2017 07:07 PM, Alexandre Belloni wrote:
> > On 19/11/2017 at 09:45:00 +0530, Arvind Yadav wrote:

> > To ensure this doesn't get applied: platform_get_irq can return
> > -EPROBE_DEFER and this must be handled properly.

> Yes, you are right. We should retry to get an irq for device. But ASoC
>  driver is not retrying. if platfore_get_irq() fail here, Driver is throwing
> an error.
> and this patch is only to fix error checking which is not correct in Driver.

> > >   	irq = platform_get_irq(pdev, 0);
> > > -	if (!irq)
> > > +	if (irq <= 0)
> > >   		return -ENODEV;

This is just squashing all error codes into -ENODEV, we'd be handling
probe deferral properly if we just returned the raw error code here.  We
need separate handling for irq == 0 which is an error but not an error
code and for cases where we've got an error code.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]