soundwire: intel_ace2x: simplify return path in hw_params

Remove unused error path (label+goto) to make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240703-soundwire-cleanup-h-v1-6-24fa0dbb948f@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c
index 4f78b7f99e44158a64f59fb86ed3ccf4e2cca893..f0008ff84ab4045455ddc13c25216df2eb65b60f 100644 (file)
--- a/drivers/soundwire/intel_ace2x.c
+++ b/drivers/soundwire/intel_ace2x.c
@@ -325,11 +325,8 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
                dir = SDW_DATA_DIR_TX;
 
        pdi = sdw_cdns_alloc_pdi(cdns, &cdns->pcm, ch, dir, dai->id);
-
-       if (!pdi) {
-               ret = -EINVAL;
-               goto error;
-       }
+       if (!pdi)
+               return -EINVAL;
 
        /* use same definitions for alh_id as previous generations */
        pdi->intel_alh_id = (sdw->instance * 16) + pdi->num + 3;
@@ -350,7 +347,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
                                  sdw->instance,
                                  pdi->intel_alh_id);
        if (ret)
-               goto error;
+               return ret;
 
        sconfig.direction = dir;
        sconfig.ch_count = ch;
@@ -361,10 +358,8 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
 
        /* Port configuration */
        pconfig = kzalloc(sizeof(*pconfig), GFP_KERNEL);
-       if (!pconfig) {
-               ret =  -ENOMEM;
-               goto error;
-       }
+       if (!pconfig)
+               return -ENOMEM;
 
        pconfig->num = pdi->num;
        pconfig->ch_mask = (1 << ch) - 1;
@@ -375,7 +370,7 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
                dev_err(cdns->dev, "add master to stream failed:%d\n", ret);
 
        kfree(pconfig);
-error:
+
        return ret;
 }