Re: [PATCH v1 1/2] gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

On Mon, Nov 07, 2022 at 06:10:26PM +0200, Andy Shevchenko wrote:
> GPIO library is getting rid of of_node, fwnode should be utilized instead.
> Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

> ---
>  drivers/gpio/gpiolib-of.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
> index be9c34cca322..000020eb78d8 100644
> --- a/drivers/gpio/gpiolib-of.c
> +++ b/drivers/gpio/gpiolib-of.c
> @@ -1104,9 +1104,11 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) { return 0; }
>  
>  int of_gpiochip_add(struct gpio_chip *chip)
>  {
> +	struct device_node *np;
>  	int ret;
>  
> -	if (!chip->of_node)
> +	np = to_of_node(chip->fwnode);
> +	if (!np)
>  		return 0;
>  
>  	if (!chip->of_xlate) {
> @@ -1123,18 +1125,18 @@ int of_gpiochip_add(struct gpio_chip *chip)
>  	if (ret)
>  		return ret;
>  
> -	of_node_get(chip->of_node);
> +	fwnode_handle_get(chip->fwnode);
>  
>  	ret = of_gpiochip_scan_gpios(chip);
>  	if (ret)
> -		of_node_put(chip->of_node);
> +		fwnode_handle_put(chip->fwnode);
>  
>  	return ret;
>  }
>  
>  void of_gpiochip_remove(struct gpio_chip *chip)
>  {
> -	of_node_put(chip->of_node);
> +	fwnode_handle_put(chip->fwnode);
>  }
>  
>  void of_gpio_dev_init(struct gpio_chip *gc, struct gpio_device *gdev)
> -- 
> 2.35.1
> 

-- 
Dmitry