[PATCH -next] ASoC: rt5682s: simplify the return of rt5682s_probe()

[PATCH -next] ASoC: rt5682s: simplify the return of rt5682s_probe()

[Yang Yingliang]

After commit bfc5e8b860ad ("ASoC: rt5682s: Reduce coupling of
Micbias and Vref2 settings"), the return of rt5682s_probe()
can be simplified. No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 sound/soc/codecs/rt5682s.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c
index 9d7a70753c6f..466a37f3500c 100644
--- a/sound/soc/codecs/rt5682s.c
+++ b/sound/soc/codecs/rt5682s.c
@@ -2864,15 +2864,10 @@ static inline int rt5682s_dai_probe_clks(struct snd_soc_component *component)
 static int rt5682s_probe(struct snd_soc_component *component)
 {
 	struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component);
-	int ret;
 
 	rt5682s->component = component;
 
-	ret = rt5682s_dai_probe_clks(component);
-	if (ret)
-		return ret;
-
-	return 0;
+	return rt5682s_dai_probe_clks(component);
 }
 
 static void rt5682s_remove(struct snd_soc_component *component)
-- 
2.25.1

Re: [PATCH -next] ASoC: rt5682s: simplify the return of rt5682s_probe()

[Mark Brown]

On Tue, 20 Sep 2022 23:14:13 +0800, Yang Yingliang wrote:
> After commit bfc5e8b860ad ("ASoC: rt5682s: Reduce coupling of
> Micbias and Vref2 settings"), the return of rt5682s_probe()
> can be simplified. No functional changed.
> 
> 

Applied to

   broonie/sound.git for-next

Thanks!

[1/1] ASoC: rt5682s: simplify the return of rt5682s_probe()
      commit: 2edd66eccfeab9734512fac352b50d17366246f5

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark