[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221109150734.38874-1-andriy.shevchenko@linux.intel.com>
Date: Wed, 9 Nov 2022 17:07:33 +0200
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Bartosz Golaszewski <brgl@...ev.pl>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
linux-gpio@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Linus Walleij <linus.walleij@...aro.org>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: [PATCH v1 1/2] gpiolib: of: Prepare of_mm_gpiochip_add_data() for fwnode
GPIO library is getting rid of of_node, fwnode should be utilized instead.
Prepare of_mm_gpiochip_add_data() for fwnode.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
---
drivers/gpio/gpiolib-of.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 4be3c21aa718..feeb9e8e846d 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -919,14 +919,15 @@ int of_mm_gpiochip_add_data(struct device_node *np,
struct of_mm_gpio_chip *mm_gc,
void *data)
{
+ struct fwnode_handle *fwnode = of_fwnode_handle(np);
int ret = -ENOMEM;
struct gpio_chip *gc = &mm_gc->gc;
- gc->label = kasprintf(GFP_KERNEL, "%pOF", np);
+ gc->label = kasprintf(GFP_KERNEL, "%pfw", fwnode);
if (!gc->label)
goto err0;
- mm_gc->regs = of_iomap(np, 0);
+ mm_gc->regs = fwnode_iomap(fwnode, 0);
if (!mm_gc->regs)
goto err1;
@@ -935,8 +936,8 @@ int of_mm_gpiochip_add_data(struct device_node *np,
if (mm_gc->save_regs)
mm_gc->save_regs(mm_gc);
- of_node_put(mm_gc->gc.of_node);
- mm_gc->gc.of_node = of_node_get(np);
+ fwnode_handle_put(mm_gc->gc.fwnode);
+ mm_gc->gc.fwnode = fwnode_handle_get(fwnode);
ret = gpiochip_add_data(gc, data);
if (ret)
@@ -944,12 +945,12 @@ int of_mm_gpiochip_add_data(struct device_node *np,
return 0;
err2:
- of_node_put(np);
+ fwnode_handle_put(fwnode);
iounmap(mm_gc->regs);
err1:
kfree(gc->label);
err0:
- pr_err("%pOF: GPIO chip registration failed with status %d\n", np, ret);
+ pr_err("%pfw: GPIO chip registration failed with status %d\n", fwnode, ret);
return ret;
}
EXPORT_SYMBOL_GPL(of_mm_gpiochip_add_data);
--
2.35.1
Powered by blists - more mailing lists