ASoC: mc13783: Use scope-based resource management in mc13783_codec_probe()

Commit Message

Markus Elfring Sept. 15, 2024, 7:50 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Sun, 15 Sep 2024 21:41:00 +0200

Scope-based resource management became supported also for another
programming interface by contributions of Jonathan Cameron on 2024-02-25.
See also the commit 9448e55d032d99af8e23487f51a542d51b2f1a48 ("of:
Add cleanup.h based auto release via __free(device_node) markings").

* Thus use the attribute “__free(device_node)”.

* Reduce the scope for the local variable “np”.

* Omit explicit of_node_put() calls accordingly.


This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[e-mail]>
---
 sound/soc/codecs/mc13783.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

--
2.46.0

Patch

diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index 086ac97e8386..ed894bfc6a1c 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -733,7 +733,6 @@  static int __init mc13783_codec_probe(struct platform_device *pdev)
 {
 	struct mc13783_priv *priv;
 	struct mc13xxx_codec_platform_data *pdata = pdev->dev.platform_data;
-	struct device_node *np;
 	int ret;

 	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -744,23 +743,18 @@  static int __init mc13783_codec_probe(struct platform_device *pdev)
 		priv->adc_ssi_port = pdata->adc_ssi_port;
 		priv->dac_ssi_port = pdata->dac_ssi_port;
 	} else {
-		np = of_get_child_by_name(pdev->dev.parent->of_node, "codec");
+		struct device_node *np __free(device_node)
+				       = of_get_child_by_name(pdev->dev.parent->of_node, "codec");
 		if (!np)
 			return -ENOSYS;

 		ret = of_property_read_u32(np, "adc-port", &priv->adc_ssi_port);
-		if (ret) {
-			of_node_put(np);
+		if (ret)
 			return ret;
-		}

 		ret = of_property_read_u32(np, "dac-port", &priv->dac_ssi_port);
-		if (ret) {
-			of_node_put(np);
+		if (ret)
 			return ret;
-		}
-
-		of_node_put(np);
 	}

 	dev_set_drvdata(&pdev->dev, priv);