From: Krzysztof Kozlowski Date: Wed, 3 Jul 2024 12:11:01 +0000 (+0200) Subject: ASoC: audio-graph-card2: Use cleanup.h instead of devm_kfree() X-Git-Tag: v6.11-rc1~108^2~6^2~13^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b39f7713ece62b2b0a3cfad7a75a0eb0ab71aa4e;p=thirdparty%2Flinux.git ASoC: audio-graph-card2: Use cleanup.h instead of devm_kfree() 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 Acked-by: Kuninori Morimoto Link: https://patch.msgid.link/20240703-asoc-cleanup-h-v1-7-71219dfd0aef@linaro.org Signed-off-by: Mark Brown --- diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 93d9d045587bc..56f7f946882e8 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -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");