[v1] input: automate of_node_put() calls for device_node

[PATCH 05/10] Input: twl4030-vibra - use cleanup facility for device_node

Posted by Javier Carrasco 1 month, 2 weeks ago

Use the '__free(device_node)' macro to simplify the code by
automatically freeing the device node.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
---
 drivers/input/misc/twl4030-vibra.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 101548b35ee3..b8ec5c7c5bce 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -165,15 +165,10 @@ static DEFINE_SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
 
 static bool twl4030_vibra_check_coexist(struct device_node *parent)
 {
-	struct device_node *node;
+	struct device_node *node __free(device_node) =
+		of_get_child_by_name(parent, "codec");
 
-	node = of_get_child_by_name(parent, "codec");
-	if (node) {
-		of_node_put(node);
-		return true;
-	}
-
-	return false;
+	return node ? true : false;
 }
 
 static int twl4030_vibra_probe(struct platform_device *pdev)

-- 
2.43.0

Re: [PATCH 05/10] Input: twl4030-vibra - use cleanup facility for device_node

Posted by Dmitry Torokhov 1 month, 1 week ago

On Thu, Oct 10, 2024 at 11:25:55PM +0200, Javier Carrasco wrote:
> Use the '__free(device_node)' macro to simplify the code by
> automatically freeing the device node.
> 
> Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
> ---
>  drivers/input/misc/twl4030-vibra.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
> index 101548b35ee3..b8ec5c7c5bce 100644
> --- a/drivers/input/misc/twl4030-vibra.c
> +++ b/drivers/input/misc/twl4030-vibra.c
> @@ -165,15 +165,10 @@ static DEFINE_SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
>  
>  static bool twl4030_vibra_check_coexist(struct device_node *parent)
>  {
> -	struct device_node *node;
> +	struct device_node *node __free(device_node) =
> +		of_get_child_by_name(parent, "codec");
>  
> -	node = of_get_child_by_name(parent, "codec");
> -	if (node) {
> -		of_node_put(node);
> -		return true;
> -	}
> -
> -	return false;
> +	return node ? true : false;

This better expressed as

	return node != NULL;

I made the adjustment and applied, thank you.

-- 
Dmitry