Skip to contentSkip to conversation

gpu: drm: exynos: hdmi: eliminate uses of of_node_put()

PATCH In review Shivani Gupta 2 participants 2 messages Apr 15, 2024 – Apr 25, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpu: drm: exynos: hdmi: eliminate uses of of_node_put()

Utilize the __free() cleanup handler within the hdmi_get_phy_io function to automatically release the device node when it is out of scope. This eliminates the manual invocation of of_node_put(), reducing the potential for memory leaks.

The modification requires initializing the device node at the beginning of the function, ensuring that the automatic cleanup is safely executed.

Consequently, this removes the need for error cleanup paths that utilize goto statements and the jump to out is no longer necessary.

---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +5 -10
index b1d02dec3774..a741fd949482 100644
@@ -1919,10 +1919,9 @@ static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)
 static int hdmi_get_phy_io(struct hdmi_context *hdata)
 {
 	const char *compatible_str = "samsung,exynos4212-hdmiphy";
-	struct device_node *np;
-	int ret = 0;
+	struct device_node *np __free(device_node) =
+		of_find_compatible_node(NULL, NULL, compatible_str);
 
-	np = of_find_compatible_node(NULL, NULL, compatible_str);
 	if (!np) {
 		np = of_parse_phandle(hdata->dev->of_node, "phy", 0);
 		if (!np) {
@@ -1937,21 +1936,17 @@ static int hdmi_get_phy_io(struct hdmi_context *hdata)
 		if (!hdata->regs_hdmiphy) {
 			DRM_DEV_ERROR(hdata->dev,
 				      "failed to ioremap hdmi phy\n");
-			ret = -ENOMEM;
-			goto out;
+			return -ENOMEM;
 		}
 	} else {
 		hdata->hdmiphy_port = of_find_i2c_device_by_node(np);
 		if (!hdata->hdmiphy_port) {
 			DRM_INFO("Failed to get hdmi phy i2c client\n");
-			ret = -EPROBE_DEFER;
-			goto out;
+			return -EPROBE_DEFER;
 		}
 	}
 
-out:
-	of_node_put(np);
-	return ret;
+	return 0;
 }
 
 static int hdmi_probe(struct platform_device *pdev)

--
2.34.1

#1 lore raw

Good cleanup. Applied. :)

Thanks,
Inki Dae

2024년 4월 15일 (월) 오전 9:40, Shivani Gupta <[email protected]>님이 작성:

Quoted 64 lines

Utilize the __free() cleanup handler within the hdmi_get_phy_io function to automatically release the device node when it is out of scope. This eliminates the manual invocation of of_node_put(), reducing the potential for memory leaks.

The modification requires initializing the device node at the beginning of the function, ensuring that the automatic cleanup is safely executed.

Consequently, this removes the need for error cleanup paths that utilize goto statements and the jump to out is no longer necessary.

---
 drivers/gpu/drm/exynos/exynos_hdmi.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +5 -11
index b1d02dec3774..a741fd949482 100644
@@ -1919,10 +1919,9 @@ static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)
 static int hdmi_get_phy_io(struct hdmi_context *hdata)
 {
        const char *compatible_str = "samsung,exynos4212-hdmiphy";
-       struct device_node *np;
-       int ret = 0;
+       struct device_node *np __free(device_node) =
+               of_find_compatible_node(NULL, NULL, compatible_str);
 
-       np = of_find_compatible_node(NULL, NULL, compatible_str);
        if (!np) {
                np = of_parse_phandle(hdata->dev->of_node, "phy", 0);
                if (!np) {
@@ -1937,21 +1936,17 @@ static int hdmi_get_phy_io(struct hdmi_context *hdata)
                if (!hdata->regs_hdmiphy) {
                        DRM_DEV_ERROR(hdata->dev,
                                      "failed to ioremap hdmi phy\n");
-                       ret = -ENOMEM;
-                       goto out;
+                       return -ENOMEM;
                }
        } else {
                hdata->hdmiphy_port = of_find_i2c_device_by_node(np);
                if (!hdata->hdmiphy_port) {
                        DRM_INFO("Failed to get hdmi phy i2c client\n");
-                       ret = -EPROBE_DEFER;
-                       goto out;
+                       return -EPROBE_DEFER;
                }
        }
 
-out:
-       of_node_put(np);
-       return ret;
+       return 0;
 }
 
 static int hdmi_probe(struct platform_device *pdev)
--

2.34.1