aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-09-13 17:43:34 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-10-27 11:12:47 -0700
commit2a60f598777d8b819383698c3dd4fd35dff21182 (patch)
tree084eca5497447a04c22017134d399261a53dd747
parentMerge branch 'ib-fwnode-gpiod-get-index' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio into next (diff)
downloadlinux-dev-2a60f598777d8b819383698c3dd4fd35dff21182.tar.xz
linux-dev-2a60f598777d8b819383698c3dd4fd35dff21182.zip
Input: gpio_keys - switch to using devm_fwnode_gpiod_get()
devm_fwnode_get_gpiod_from_child() is going away as the name is too unwieldy, let's switch to using the new devm_fwnode_gpiod_get(). Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/gpio_keys.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 1373dc5b0765..1f56d53454b2 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -494,10 +494,8 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
spin_lock_init(&bdata->lock);
if (child) {
- bdata->gpiod = devm_fwnode_get_gpiod_from_child(dev, NULL,
- child,
- GPIOD_IN,
- desc);
+ bdata->gpiod = devm_fwnode_gpiod_get(dev, child,
+ NULL, GPIOD_IN, desc);
if (IS_ERR(bdata->gpiod)) {
error = PTR_ERR(bdata->gpiod);
if (error == -ENOENT) {