| Message ID | 20230608084727.74403-4-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4882ef44f51bbb759b8a738b747fdbcbad38e51b |
| Headers | show |
| Series | ASoC: mt8188-mt6359: Cleanups | expand |
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 <amergnat@baylibre.com>
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 <angelogioacchino.delregno@collabora.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > 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 = {
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 = {
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 <angelogioacchino.delregno@collabora.com> --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)