Skip to contentSkip to conversation

gpio: regmap: Switch to use fwnode instead of of_node

PATCH Applied Andy Shevchenko 3 participants 3 messages Dec 23, 2021

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

PATCH 1/1 gpio: regmap: Switch to use fwnode instead of of_node

GPIO library now accepts fwnode as a firmware node, so switch the driver to use it.

---
 drivers/gpio/gpio-regmap.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpio/gpio-regmap.c +1 -5
index 69c219742083..6383136cbe59 100644
@@ -244,16 +244,12 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config
 
 	chip = &gpio->gpio_chip;
 	chip->parent = config->parent;
+	chip->fwnode = config->fwnode;
 	chip->base = -1;
 	chip->ngpio = config->ngpio;
 	chip->names = config->names;
 	chip->label = config->label ?: dev_name(config->parent);
 
-#if defined(CONFIG_OF_GPIO)
-	/* gpiolib will use of_node of the parent if chip->of_node is NULL */
-	chip->of_node = to_of_node(config->fwnode);
-#endif /* CONFIG_OF_GPIO */
-
 	/*
 	 * If our regmap is fast_io we should probably set can_sleep to false.
 	 * Right now, the regmap doesn't save this property, nor is there any
Signature · 1 line
2.34.1
#2 lore raw
In reply to Andy Shevchenko
Quoted 32 lines · Andy Shevchenko

GPIO library now accepts fwnode as a firmware node, so switch the driver to use it.

---
 drivers/gpio/gpio-regmap.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpio/gpio-regmap.c +1 -6
index 69c219742083..6383136cbe59 100644
@@ -244,16 +244,12 @@ struct gpio_regmap *gpio_regmap_register(const struct gpio_regmap_config *config
 
        chip = &gpio->gpio_chip;
        chip->parent = config->parent;
+       chip->fwnode = config->fwnode;
        chip->base = -1;
        chip->ngpio = config->ngpio;
        chip->names = config->names;
        chip->label = config->label ?: dev_name(config->parent);
 
-#if defined(CONFIG_OF_GPIO)
-       /* gpiolib will use of_node of the parent if chip->of_node is NULL */
-       chip->of_node = to_of_node(config->fwnode);
-#endif /* CONFIG_OF_GPIO */
-
        /*
         * If our regmap is fast_io we should probably set can_sleep to false.
         * Right now, the regmap doesn't save this property, nor is there any
--
Quoted 2 lines

2.34.1

Applied, thanks!

Bart