[PATCH v2 2/5] gpiolib: Unify the checks on fwnode type

[Andy Shevchenko]

We have (historically) different approaches how we identify the type
of a given fwnode. Let's standardize them across the library code.

Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Reviewed-by: Linus Walleij <linus.wall...@linaro.org>
---
 drivers/gpio/gpiolib.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index adf55db080d8..484ac92903ab 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3678,11 +3678,12 @@ EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index);
  */
 int gpiod_count(struct device *dev, const char *con_id)
 {
+       const struct fwnode_handle *fwnode = dev_fwnode(dev);
        int count = -ENOENT;
 
-       if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
+       if (is_of_node(fwnode))
                count = of_gpio_get_count(dev, con_id);
-       else if (IS_ENABLED(CONFIG_ACPI) && dev && ACPI_HANDLE(dev))
+       else if (is_acpi_node(fwnode))
                count = acpi_gpio_count(dev, con_id);
 
        if (count < 0)
@@ -3820,18 +3821,17 @@ struct gpio_desc *__must_check gpiod_get_index(struct 
device *dev,
        int ret;
        /* Maybe we have a device name, maybe not */
        const char *devname = dev ? dev_name(dev) : "?";
+       const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL;
 
        dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id);
 
-       if (dev) {
-               /* Using device tree? */
-               if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
-                       dev_dbg(dev, "using device tree for GPIO lookup\n");
-                       desc = of_find_gpio(dev, con_id, idx, &lookupflags);
-               } else if (ACPI_COMPANION(dev)) {
-                       dev_dbg(dev, "using ACPI for GPIO lookup\n");
-                       desc = acpi_find_gpio(dev, con_id, idx, &flags, 
&lookupflags);
-               }
+       /* Using device tree? */
+       if (is_of_node(fwnode)) {
+               dev_dbg(dev, "using device tree for GPIO lookup\n");
+               desc = of_find_gpio(dev, con_id, idx, &lookupflags);
+       } else if (is_acpi_node(fwnode)) {
+               dev_dbg(dev, "using ACPI for GPIO lookup\n");
+               desc = acpi_find_gpio(dev, con_id, idx, &flags, &lookupflags);
        }
 
        /*
@@ -3915,9 +3915,6 @@ struct gpio_desc *fwnode_get_named_gpiod(struct 
fwnode_handle *fwnode,
        struct gpio_desc *desc = ERR_PTR(-ENODEV);
        int ret;
 
-       if (!fwnode)
-               return ERR_PTR(-EINVAL);
-
        if (is_of_node(fwnode)) {
                desc = gpiod_get_from_of_node(to_of_node(fwnode),
                                              propname, index,
@@ -3933,7 +3930,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct 
fwnode_handle *fwnode,
 
                acpi_gpio_update_gpiod_flags(&dflags, &info);
                acpi_gpio_update_gpiod_lookup_flags(&lflags, &info);
-       }
+       } else
+               return ERR_PTR(-EINVAL);
 
        /* Currently only ACPI takes this path */
        ret = gpiod_request(desc, label);
-- 
2.30.1