From: Andy Shevchenko Date: Thu, 23 Dec 2021 12:16:06 +0000 (+0200) Subject: gpio: regmap: Switch to use fwnode instead of of_node X-Git-Tag: v5.17-rc1~142^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f21ecad451c9b33d56165da61b0f5a9a535bfd3c;p=thirdparty%2Fkernel%2Flinux.git 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. Signed-off-by: Andy Shevchenko Reviewed-by: Michael Walle Signed-off-by: Bartosz Golaszewski --- diff --git a/drivers/gpio/gpio-regmap.c b/drivers/gpio/gpio-regmap.c index 69c219742083a..6383136cbe599 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