| Message ID | 20211223121606.67055-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/1] gpio: regmap: Switch to use fwnode instead of of_node | expand |
Am 2021-12-23 13:16, schrieb Andy Shevchenko: > GPIO library now accepts fwnode as a firmware node, so > switch the driver to use it. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Michael Walle <michael@walle.cc>
On Thu, Dec 23, 2021 at 1:16 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > GPIO library now accepts fwnode as a firmware node, so > switch the driver to use it. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/gpio/gpio-regmap.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c > index 69c219742083..6383136cbe59 100644 > --- a/drivers/gpio/gpio-regmap.c > +++ b/drivers/gpio/gpio-regmap.c > @@ -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 > -- > 2.34.1 > Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 69c219742083..6383136cbe59 100644 --- a/drivers/gpio/gpio-regmap.c +++ b/drivers/gpio/gpio-regmap.c @@ -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
GPIO library now accepts fwnode as a firmware node, so switch the driver to use it. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/gpio/gpio-regmap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)