ASoC: ops: 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-9-71219dfd0aef@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index b27e89ff6a1673f57db6e253a818d6fbe3d1ab91..19928f098d8dcbf9055727b2a81b6eade6fe52ef 100644 (file)
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -11,6 +11,7 @@
 //         with code, comments and ideas from :-
 //         Richard Purdie <richard@openedhand.com>
 
+#include <linux/cleanup.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
@@ -727,14 +728,14 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
        struct soc_bytes *params = (void *)kcontrol->private_value;
        int ret, len;
        unsigned int val, mask;
-       void *data;
 
        if (!component->regmap || !params->num_regs)
                return -EINVAL;
 
        len = params->num_regs * component->val_bytes;
 
-       data = kmemdup(ucontrol->value.bytes.data, len, GFP_KERNEL | GFP_DMA);
+       void *data __free(kfree) = kmemdup(ucontrol->value.bytes.data, len,
+                                          GFP_KERNEL | GFP_DMA);
        if (!data)
                return -ENOMEM;
 
@@ -746,7 +747,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
        if (params->mask) {
                ret = regmap_read(component->regmap, params->base, &val);
                if (ret != 0)
-                       goto out;
+                       return ret;
 
                val &= params->mask;
 
@@ -760,14 +761,14 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                        ret = regmap_parse_val(component->regmap,
                                                        &mask, &mask);
                        if (ret != 0)
-                               goto out;
+                               return ret;
 
                        ((u16 *)data)[0] &= mask;
 
                        ret = regmap_parse_val(component->regmap,
                                                        &val, &val);
                        if (ret != 0)
-                               goto out;
+                               return ret;
 
                        ((u16 *)data)[0] |= val;
                        break;
@@ -776,30 +777,23 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
                        ret = regmap_parse_val(component->regmap,
                                                        &mask, &mask);
                        if (ret != 0)
-                               goto out;
+                               return ret;
 
                        ((u32 *)data)[0] &= mask;
 
                        ret = regmap_parse_val(component->regmap,
                                                        &val, &val);
                        if (ret != 0)
-                               goto out;
+                               return ret;
 
                        ((u32 *)data)[0] |= val;
                        break;
                default:
-                       ret = -EINVAL;
-                       goto out;
+                       return -EINVAL;
                }
        }
 
-       ret = regmap_raw_write(component->regmap, params->base,
-                              data, len);
-
-out:
-       kfree(data);
-
-       return ret;
+       return regmap_raw_write(component->regmap, params->base, data, len);
 }
 EXPORT_SYMBOL_GPL(snd_soc_bytes_put);