Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1431021 > unrolled thread

[PATCH v2 1/8] Input: synaptics-rmi4: Increment the refcount of the transport dev's of_node

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 1/8] Input: synaptics-rmi4: Increment the refcount of the transport dev's of_node Andrew Duggan <aduggan@synaptics.com> - 2016-06-25 02:20 +0200
    Re: [PATCH v2 1/8] Input: synaptics-rmi4: Increment the refcount of  the transport dev's of_node Nick Dyer <nick.dyer@itdev.co.uk> - 2016-07-04 16:20 +0200

#1431021 — [PATCH v2 1/8] Input: synaptics-rmi4: Increment the refcount of the transport dev's of_node

Increment the refcount for the transport device's of_node before calling
of_find_node_by_name(). Since of_find_node_by_name() assumes the refcount
was incremented by the caller and calls of_node_put() when it is done.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
---
 drivers/input/rmi4/rmi_bus.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index b368b05..55b5336 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -157,11 +157,12 @@ static int rmi_function_match(struct device *dev, struct device_driver *drv)
 static void rmi_function_of_probe(struct rmi_function *fn)
 {
 	char of_name[9];
+	struct device_node *node = fn->rmi_dev->xport->dev->of_node;
 
 	snprintf(of_name, sizeof(of_name), "rmi4-f%02x",
 		fn->fd.function_number);
-	fn->dev.of_node = of_find_node_by_name(
-				fn->rmi_dev->xport->dev->of_node, of_name);
+	of_node_get(node);
+	fn->dev.of_node = of_find_node_by_name(node, of_name);
 }
 #else
 static inline void rmi_function_of_probe(struct rmi_function *fn)
-- 
2.5.0

[toc] | [next] | [standalone]

#1436542 — Re: [PATCH v2 1/8] Input: synaptics-rmi4: Increment the refcount of the transport dev's of_node

On 25/06/2016 01:17, Andrew Duggan wrote:
> Increment the refcount for the transport device's of_node before calling
> of_find_node_by_name(). Since of_find_node_by_name() assumes the refcount
> was incremented by the caller and calls of_node_put() when it is done.
> 
> Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
> ---
>  drivers/input/rmi4/rmi_bus.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
> index b368b05..55b5336 100644
> --- a/drivers/input/rmi4/rmi_bus.c
> +++ b/drivers/input/rmi4/rmi_bus.c
> @@ -157,11 +157,12 @@ static int rmi_function_match(struct device *dev, struct device_driver *drv)
>  static void rmi_function_of_probe(struct rmi_function *fn)
>  {
>  	char of_name[9];
> +	struct device_node *node = fn->rmi_dev->xport->dev->of_node;
>  
>  	snprintf(of_name, sizeof(of_name), "rmi4-f%02x",
>  		fn->fd.function_number);
> -	fn->dev.of_node = of_find_node_by_name(
> -				fn->rmi_dev->xport->dev->of_node, of_name);
> +	of_node_get(node);
> +	fn->dev.of_node = of_find_node_by_name(node, of_name);

Could this be changed to of_get_child_by_name() (which doesn't call
of_node_put) instead of doing the refcount hack?

>  }
>  #else
>  static inline void rmi_function_of_probe(struct rmi_function *fn)
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web