ASoC: cs47l92: Simplify error handling code in 'cs47l92_probe()'

If 'madera_init_bus_error_irq()' fails,
'wm_adsp2_remove(&cs47l92->core.adsp[0])' will be called twice.
Once in the 'if' block, and once in the error handling path.
This is harmless, but one of this call can be axed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20191226162907.9490-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs47l92.c b/sound/soc/codecs/cs47l92.c
index d50f75f3b3e4194bb3bb4c725d4f8c9163a5d9ca..536b7d35d6b278fb06f7cd29deccd48f42244c94 100644 (file)
--- a/sound/soc/codecs/cs47l92.c
+++ b/sound/soc/codecs/cs47l92.c
@@ -1959,10 +1959,8 @@ static int cs47l92_probe(struct platform_device *pdev)
                goto error_dsp_irq;
 
        ret = madera_init_bus_error_irq(&cs47l92->core, 0, wm_adsp2_bus_error);
-       if (ret != 0) {
-               wm_adsp2_remove(&cs47l92->core.adsp[0]);
+       if (ret != 0)
                goto error_adsp;
-       }
 
        madera_init_fll(madera, 1, MADERA_FLL1_CONTROL_1 - 1,
                        &cs47l92->fll[0]);