ASoC: codecs: wcd934x: Simplify with cleanup.h

Allocate the memory with scoped/cleanup.h to reduce error handling (less
error paths) and make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240703-asoc-cleanup-h-v1-4-71219dfd0aef@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index 6c65b46e2dc9a70b486e2f858e8d521ee9a26b73..291d0c80a6fcf1a5d1c0bfb8385d79312be3f9fa 100644 (file)
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2019, Linaro Limited
 
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/interrupt.h>
@@ -4973,25 +4974,23 @@ static int wcd934x_codec_enable_dec(struct snd_soc_dapm_widget *w,
        struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);
        unsigned int decimator;
        char *dec_adc_mux_name = NULL;
-       char *widget_name = NULL;
-       char *wname;
+       char *widget_name;
        int ret = 0, amic_n;
        u16 tx_vol_ctl_reg, pwr_level_reg = 0, dec_cfg_reg, hpf_gate_reg;
        u16 tx_gain_ctl_reg;
        char *dec;
        u8 hpf_coff_freq;
 
-       widget_name = kstrndup(w->name, 15, GFP_KERNEL);
-       if (!widget_name)
+       char *wname __free(kfree) = kstrndup(w->name, 15, GFP_KERNEL);
+       if (!wname)
                return -ENOMEM;
 
-       wname = widget_name;
+       widget_name = wname;
        dec_adc_mux_name = strsep(&widget_name, " ");
        if (!dec_adc_mux_name) {
                dev_err(comp->dev, "%s: Invalid decimator = %s\n",
                        __func__, w->name);
-               ret =  -EINVAL;
-               goto out;
+               return -EINVAL;
        }
        dec_adc_mux_name = widget_name;
 
@@ -4999,16 +4998,14 @@ static int wcd934x_codec_enable_dec(struct snd_soc_dapm_widget *w,
        if (!dec) {
                dev_err(comp->dev, "%s: decimator index not found\n",
                        __func__);
-               ret =  -EINVAL;
-               goto out;
+               return -EINVAL;
        }
 
        ret = kstrtouint(dec, 10, &decimator);
        if (ret < 0) {
                dev_err(comp->dev, "%s: Invalid decimator = %s\n",
                        __func__, wname);
-               ret =  -EINVAL;
-               goto out;
+               return -EINVAL;
        }
 
        tx_vol_ctl_reg = WCD934X_CDC_TX0_TX_PATH_CTL + 16 * decimator;
@@ -5101,8 +5098,7 @@ static int wcd934x_codec_enable_dec(struct snd_soc_dapm_widget *w,
                                              WCD934X_DEC_PWR_LVL_DF);
                break;
        }
-out:
-       kfree(wname);
+
        return ret;
 }