soundwire: intel: 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-4-24fa0dbb948f@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 01e1a0f3ec394e6a991bb1751e2e4e35fd8b33e9..b4449095b423835a933e274df321e95a2fd3a895 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -743,10 +743,8 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
 
        pdi = sdw_cdns_alloc_pdi(cdns, &cdns->pcm, ch, dir, dai->id);
 
-       if (!pdi) {
-               ret = -EINVAL;
-               goto error;
-       }
+       if (!pdi)
+               return -EINVAL;
 
        /* do run-time configurations for SHIM, ALH and PDI/PORT */
        intel_pdi_shim_configure(sdw, pdi);
@@ -763,7 +761,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;
@@ -774,10 +772,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;
@@ -788,7 +784,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;
 }