]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: renesas: rz-ssi: Use goto label names that specify their actions
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Tue, 10 Dec 2024 17:09:41 +0000 (19:09 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 11 Dec 2024 13:24:02 +0000 (13:24 +0000)
Use goto label names that specify their action. In this way we can have
a better understanding of what is the action associated with the label
by just reading the label name.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20241210170953.2936724-13-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/renesas/rz-ssi.c

index 74632e2482f893b1ef34b55ca8e933896bb5005d..209b5b8827e50e4001e7001335c7b6e1507df824 100644 (file)
@@ -1084,15 +1084,15 @@ static int rz_ssi_probe(struct platform_device *pdev)
        /* Error Interrupt */
        ssi->irq_int = platform_get_irq_byname(pdev, "int_req");
        if (ssi->irq_int < 0) {
-               rz_ssi_release_dma_channels(ssi);
-               return ssi->irq_int;
+               ret = ssi->irq_int;
+               goto err_release_dma_chs;
        }
 
        ret = devm_request_irq(dev, ssi->irq_int, &rz_ssi_interrupt,
                               0, dev_name(dev), ssi);
        if (ret < 0) {
-               rz_ssi_release_dma_channels(ssi);
-               return dev_err_probe(dev, ret, "irq request error (int_req)\n");
+               dev_err_probe(dev, ret, "irq request error (int_req)\n");
+               goto err_release_dma_chs;
        }
 
        if (!rz_ssi_is_dma_enabled(ssi)) {
@@ -1136,7 +1136,7 @@ static int rz_ssi_probe(struct platform_device *pdev)
        ssi->rstc = devm_reset_control_get_exclusive(dev, NULL);
        if (IS_ERR(ssi->rstc)) {
                ret = PTR_ERR(ssi->rstc);
-               goto err_reset;
+               goto err_release_dma_chs;
        }
 
        reset_control_deassert(ssi->rstc);
@@ -1152,17 +1152,17 @@ static int rz_ssi_probe(struct platform_device *pdev)
                                              ARRAY_SIZE(rz_ssi_soc_dai));
        if (ret < 0) {
                dev_err(dev, "failed to register snd component\n");
-               goto err_snd_soc;
+               goto err_pm_put;
        }
 
        return 0;
 
-err_snd_soc:
+err_pm_put:
        pm_runtime_put(dev);
 err_pm:
        pm_runtime_disable(dev);
        reset_control_assert(ssi->rstc);
-err_reset:
+err_release_dma_chs:
        rz_ssi_release_dma_channels(ssi);
 
        return ret;