aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngeloGioacchino Del Regno <[email protected]>2023-06-08 10:47:25 +0200
committerMark Brown <[email protected]>2023-06-08 11:36:19 +0100
commit4882ef44f51bbb759b8a738b747fdbcbad38e51b (patch)
tree5f83503eae2ebad55c2f15d9b709f9de5b01acba
parent1148b42257e2bf30093708398db2c4570ae9fe97 (diff)
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]> Reviewed-by: Alexandre Mergnat <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
-rw-r--r--sound/soc/mediatek/mt8188/mt8188-mt6359.c20
1 files 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 = {