2022-03-03 08:43:43

by Jiasheng Jiang

Subject: [PATCH] ASoC: wm8350: Handle error for wm8350_register_irq

As the potential failure of the wm8350_register_irq(),
it should be better to check it and return error if fails.
Also, use 'free_' in order to avoid the same code.

Fixes: a6ba2b2dabb5 ("ASoC: Implement WM8350 headphone jack detection")
Signed-off-by: Jiasheng Jiang <[email protected]>
---
sound/soc/codecs/wm8350.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 15d42ce3b21d..0c70bbfbedb5 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1483,7 +1483,7 @@ static int wm8350_component_probe(struct snd_soc_component *component)
ret = devm_regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies),
priv->supplies);
if (ret != 0)
- return ret;
+ goto err;

/* Put the codec into reset if it wasn't already */
wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
@@ -1537,18 +1537,38 @@ static int wm8350_component_probe(struct snd_soc_component *component)
wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,
WM8350_JDL_ENA | WM8350_JDR_ENA);

- wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L,
+ ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L,
wm8350_hpl_jack_handler, 0, "Left jack detect",
priv);
- wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
+ if (ret != 0)
+ goto err;
+
+ ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
wm8350_hpr_jack_handler, 0, "Right jack detect",
priv);
- wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICSCD,
+ if (ret != 0)
+ goto free_JCK_DET_L;
+
+ ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICSCD,
wm8350_mic_handler, 0, "Microphone short", priv);
- wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,
+ if (ret != 0)
+ goto free_JCK_DET_R;
+
+ ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,
wm8350_mic_handler, 0, "Microphone detect", priv);
+ if (ret != 0)
+ goto free_MICSCD;

return 0;
+
+free_MICSCD:
+ wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_MICSCD, priv);
+free_JCK_DET_R:
+ wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R, priv);
+free_JCK_DET_L:
+ wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L, priv);
+err:
+ return ret;
}

static void wm8350_component_remove(struct snd_soc_component *component)
--
2.25.1

2022-03-03 14:41:03

by Charles Keepax

Subject: Re: [PATCH] ASoC: wm8350: Handle error for wm8350_register_irq

On Thu, Mar 03, 2022 at 04:21:54PM +0800, Jiasheng Jiang wrote:
> As the potential failure of the wm8350_register_irq(),
> it should be better to check it and return error if fails.
> Also, use 'free_' in order to avoid the same code.
>
> Fixes: a6ba2b2dabb5 ("ASoC: Implement WM8350 headphone jack detection")
> Signed-off-by: Jiasheng Jiang <[email protected]>
> ---
> sound/soc/codecs/wm8350.c | 30 +++++++++++++++++++++++++-----
> 1 file changed, 25 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
> index 15d42ce3b21d..0c70bbfbedb5 100644
> --- a/sound/soc/codecs/wm8350.c
> +++ b/sound/soc/codecs/wm8350.c
> @@ -1483,7 +1483,7 @@ static int wm8350_component_probe(struct snd_soc_component *component)
> ret = devm_regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies),
> priv->supplies);
> if (ret != 0)
> - return ret;
> + goto err;

I would probably just leave this as a return, nothing is gained
changing it to a goto.

>
> + ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
> wm8350_hpr_jack_handler, 0, "Right jack detect",
> priv);
> - wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICSCD,
> + if (ret != 0)
> + goto free_JCK_DET_L;

Probably better to use non-caps here, having caps in a label is a
little unusual.

Otherwise I think this looks fine.

Thanks,
Charles

2022-03-04 13:19:32

by Jiasheng Jiang

Subject: Re: Re: [PATCH] ASoC: wm8350: Handle error for wm8350_register_irq

On Thu, Mar 03, 2022 at 09:38:34PM +0800, Charles Keepax wrote:
>> if (ret != 0)
>> - return ret;
>> + goto err;
>
> I would probably just leave this as a return, nothing is gained
> changing it to a goto.
>
>>
>> + ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
>> wm8350_hpr_jack_handler, 0, "Right jack detect",
>> priv);
>> - wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICSCD,
>> + if (ret != 0)
>> + goto free_JCK_DET_L;
>
> Probably better to use non-caps here, having caps in a label is a
> little unusual.

Thansk, I have submitted v2 to solve the problems.

Jiang