2023-06-08 09:05:54

by AngeloGioacchino Del Regno

Subject: [PATCH 3/5] ASoC: mediatek: mt8188-mt6359: Cleanup return 0 disguised as return ret

Change all instances of `return ret` to `return 0` at the end of
functions where ret is always zero and also change functions
mt8188_{hdmi,dptx}_codec_init to be consistent with how other
functions are returning errors

Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
---
sound/soc/mediatek/mt8188/mt8188-mt6359.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
index b2735496d140..260cace408b9 100644
--- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
+++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -491,11 +491,13 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd)
}

ret = snd_soc_component_set_jack(component, &priv->hdmi_jack, NULL);
- if (ret)
+ if (ret) {
dev_info(rtd->dev, "%s, set jack failed on %s (ret=%d)\n",
__func__, component->name, ret);
+ return ret;
+ }

- return ret;
+ return 0;
}

static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)
@@ -513,11 +515,13 @@ static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)
}

ret = snd_soc_component_set_jack(component, &priv->dp_jack, NULL);
- if (ret)
+ if (ret) {
dev_info(rtd->dev, "%s, set jack failed on %s (ret=%d)\n",
__func__, component->name, ret);
+ return ret;
+ }

- return ret;
+ return 0;
}

static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd)
@@ -539,7 +543,7 @@ static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}

- return ret;
+ return 0;
}

static int mt8188_max98390_hw_params(struct snd_pcm_substream *substream,
@@ -612,7 +616,7 @@ static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}

- return ret;
+ return 0;
}

static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
@@ -660,7 +664,7 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}

- return ret;
+ return 0;
};

static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)
@@ -697,7 +701,7 @@ static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream,
return ret;
}

- return ret;
+ return 0;
}

static const struct snd_soc_ops mt8188_nau8825_ops = {
--
2.40.1

2023-06-08 09:46:30

by Alexandre Mergnat

Subject: Re: [PATCH 3/5] ASoC: mediatek: mt8188-mt6359: Cleanup return 0 disguised as return ret

On 08/06/2023 10:47, AngeloGioacchino Del Regno wrote:
> Change all instances of `return ret` to `return 0` at the end of
> functions where ret is always zero and also change functions
> mt8188_{hdmi,dptx}_codec_init to be consistent with how other
> functions are returning errors

Reviewed-by: Alexandre Mergnat <[email protected]>

--
Regards,
Alexandre

2023-06-08 17:28:03

by Matthias Brugger

Subject: Re: [PATCH 3/5] ASoC: mediatek: mt8188-mt6359: Cleanup return 0 disguised as return ret

On 08/06/2023 10:47, AngeloGioacchino Del Regno wrote:
> Change all instances of `return ret` to `return 0` at the end of
> functions where ret is always zero and also change functions
> mt8188_{hdmi,dptx}_codec_init to be consistent with how other
> functions are returning errors
>
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>

Reviewed-by: Matthias Brugger <[email protected]>

> ---
> sound/soc/mediatek/mt8188/mt8188-mt6359.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> index b2735496d140..260cace408b9 100644
> --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
> @@ -491,11 +491,13 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd)
> }
>
> ret = snd_soc_component_set_jack(component, &priv->hdmi_jack, NULL);
> - if (ret)
> + if (ret) {
> dev_info(rtd->dev, "%s, set jack failed on %s (ret=%d)\n",
> __func__, component->name, ret);
> + return ret;
> + }
>
> - return ret;
> + return 0;
> }
>
> static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)
> @@ -513,11 +515,13 @@ static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)
> }
>
> ret = snd_soc_component_set_jack(component, &priv->dp_jack, NULL);
> - if (ret)
> + if (ret) {
> dev_info(rtd->dev, "%s, set jack failed on %s (ret=%d)\n",
> __func__, component->name, ret);
> + return ret;
> + }
>
> - return ret;
> + return 0;
> }
>
> static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd)
> @@ -539,7 +543,7 @@ static int mt8188_dumb_amp_init(struct snd_soc_pcm_runtime *rtd)
> return ret;
> }
>
> - return ret;
> + return 0;
> }
>
> static int mt8188_max98390_hw_params(struct snd_pcm_substream *substream,
> @@ -612,7 +616,7 @@ static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd)
> return ret;
> }
>
> - return ret;
> + return 0;
> }
>
> static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
> @@ -660,7 +664,7 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
> return ret;
> }
>
> - return ret;
> + return 0;
> };
>
> static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)
> @@ -697,7 +701,7 @@ static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream,
> return ret;
> }
>
> - return ret;
> + return 0;
> }
>
> static const struct snd_soc_ops mt8188_nau8825_ops = {