]> www.infradead.org Git - users/hch/configfs.git/commitdiff
ASoC: audio-graph-card2: Use cleanup.h instead of devm_kfree()
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 3 Jul 2024 12:11:01 +0000 (14:11 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 8 Jul 2024 11:50:00 +0000 (12:50 +0100)
Allocate the memory with scoped/cleanup.h, instead of devm interface, to
make the code more obvious that memory is not used outside this scope.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/20240703-asoc-cleanup-h-v1-7-71219dfd0aef@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/audio-graph-card2.c

index 93d9d045587bc43e7be579f21c4cf51115263030..56f7f946882e831cc4474c86b31f69e15de1549a 100644 (file)
@@ -1350,10 +1350,9 @@ int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev,
                          struct graph2_custom_hooks *hooks)
 {
        struct snd_soc_card *card = simple_priv_to_card(priv);
-       struct link_info *li;
        int ret;
 
-       li = devm_kzalloc(dev, sizeof(*li), GFP_KERNEL);
+       struct link_info *li __free(kfree) = kzalloc(sizeof(*li), GFP_KERNEL);
        if (!li)
                return -ENOMEM;
 
@@ -1417,8 +1416,6 @@ int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev,
 
        ret = devm_snd_soc_register_card(dev, card);
 err:
-       devm_kfree(dev, li);
-
        if (ret < 0)
                dev_err_probe(dev, ret, "parse error\n");