ASoC: codecs: lpass-wsa-macro: Simplify with cleanup.h

Driver's probe() has two allocations which are needed only within the
probe() itself - for devm_regmap_init_mmio().

Usage of devm interface is a bit misleading here, because these can be
freed right after each scope finishes.

This makes the code a bit more obvious and self documenting.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240701-b4-qcom-audio-lpass-codec-cleanups-v3-6-6d98d4dd1ef5@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index b4e7139bac619a3a1f92b90545bf3dde65086e2d..73a5882894080019b2a6330c5e7258dd1de3b28a 100644 (file)
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
 
+#include <linux/cleanup.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/io.h>
@@ -2725,8 +2726,6 @@ static const struct snd_soc_component_driver wsa_macro_component_drv = {
 static int wsa_macro_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct reg_default *reg_defaults;
-       struct regmap_config *reg_config;
        struct wsa_macro *wsa;
        kernel_ulong_t flags;
        void __iomem *base;
@@ -2765,6 +2764,8 @@ static int wsa_macro_probe(struct platform_device *pdev)
                return PTR_ERR(base);
 
        wsa->codec_version = lpass_macro_get_codec_version();
+       struct reg_default *reg_defaults __free(kfree) = NULL;
+
        switch (wsa->codec_version) {
        case LPASS_CODEC_VERSION_1_0:
        case LPASS_CODEC_VERSION_1_1:
@@ -2773,9 +2774,8 @@ static int wsa_macro_probe(struct platform_device *pdev)
        case LPASS_CODEC_VERSION_2_1:
                wsa->reg_layout = &wsa_codec_v2_1;
                def_count = ARRAY_SIZE(wsa_defaults) + ARRAY_SIZE(wsa_defaults_v2_1);
-               reg_defaults = devm_kmalloc_array(dev, def_count,
-                                                 sizeof(*reg_defaults),
-                                                 GFP_KERNEL);
+               reg_defaults = kmalloc_array(def_count, sizeof(*reg_defaults),
+                                            GFP_KERNEL);
                if (!reg_defaults)
                        return -ENOMEM;
                memcpy(&reg_defaults[0], wsa_defaults, sizeof(wsa_defaults));
@@ -2789,9 +2789,8 @@ static int wsa_macro_probe(struct platform_device *pdev)
        case LPASS_CODEC_VERSION_2_8:
                wsa->reg_layout = &wsa_codec_v2_5;
                def_count = ARRAY_SIZE(wsa_defaults) + ARRAY_SIZE(wsa_defaults_v2_5);
-               reg_defaults = devm_kmalloc_array(dev, def_count,
-                                                 sizeof(*reg_defaults),
-                                                 GFP_KERNEL);
+               reg_defaults = kmalloc_array(def_count, sizeof(*reg_defaults),
+                                            GFP_KERNEL);
                if (!reg_defaults)
                        return -ENOMEM;
                memcpy(&reg_defaults[0], wsa_defaults, sizeof(wsa_defaults));
@@ -2804,8 +2803,9 @@ static int wsa_macro_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       reg_config = devm_kmemdup(dev, &wsa_regmap_config,
-                                 sizeof(*reg_config), GFP_KERNEL);
+       struct regmap_config *reg_config __free(kfree) = kmemdup(&wsa_regmap_config,
+                                                                sizeof(*reg_config),
+                                                                GFP_KERNEL);
        if (!reg_config)
                return -ENOMEM;
 
@@ -2816,8 +2816,6 @@ static int wsa_macro_probe(struct platform_device *pdev)
        if (IS_ERR(wsa->regmap))
                return PTR_ERR(wsa->regmap);
 
-       devm_kfree(dev, reg_config);
-       devm_kfree(dev, reg_defaults);
        dev_set_drvdata(dev, wsa);
 
        wsa->dev = dev;