Commit 944f4b0a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

gpiolib: Unify the checks on fwnode type 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 67196fea

drivers/gpio/gpiolib.c

+13 −15
Original line number Diff line number Diff line
@@ -3684,11 +3684,12 @@ EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index); 
 */

int gpiod_count(struct device *dev, const char *con_id)

{

	const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL;

	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)
@@ -3826,19 +3827,18 @@ 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) {

	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 (ACPI_COMPANION(dev)) {

	} 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);

	}

	}



	/*

	 * Either we are not using DT or ACPI, or their lookup did not return
@@ -3921,9 +3921,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,
@@ -3939,7 +3936,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);