From: Weijie Gao Date: Sat, 6 Jan 2024 19:31:28 +0000 (+0800) Subject: gpio-button-hotplug: fix 6.2 build failure X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7fcbcea75120fbab5adb87b6c63029dfd8812a39;p=openwrt%2Fstaging%2Fneocturne.git gpio-button-hotplug: fix 6.2 build failure devm_gpiod_get_from_of_node() was removed since linux 6.2. devm_fwnode_gpiod_get() is the recommended replacement. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpio/gpiolib-devres.c?id=650f2dc970539b3344a98c4bd18efa309e66623b Signed-off-by: Robert Marko Signed-off-by: Weijie Gao --- diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 522085bb2f..e36494c2fe 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -538,8 +538,9 @@ static int gpio_keys_button_probe(struct platform_device *pdev, struct device_node *child = of_get_next_child(dev->of_node, prev); - bdata->gpiod = devm_gpiod_get_from_of_node(dev, - child, "gpios", 0, GPIOD_IN, desc); + bdata->gpiod = devm_fwnode_gpiod_get(dev, + of_fwnode_handle(child), NULL, GPIOD_IN, + desc); prev = child; }