Commit 2d6c06f5 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

gpiolib: Introduce GPIO_LOOKUP_FLAGS_DEFAULT 



Since GPIO library operates with enumerator when it's subject to handle
the GPIO lookup flags, it will be better to clearly see what default means.

Thus, introduce GPIO_LOOKUP_FLAGS_DEFAULT entry to describe
the default assumptions.

While here, replace 0 by newly introduced constant.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fed7026a

drivers/gpio/gpiolib-acpi.c

+3 −2
Original line number Diff line number Diff line
@@ -819,6 +819,7 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) 
			return PTR_ERR(desc);



		if (info.gpioint && idx++ == index) {

			unsigned long lflags = GPIO_LOOKUP_FLAGS_DEFAULT;

			char label[32];

			int irq;
@@ -830,7 +831,7 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) 
				return irq;



			snprintf(label, sizeof(label), "GpioInt() %d", index);

			ret = gpiod_configure_flags(desc, label, 0, info.flags);

			ret = gpiod_configure_flags(desc, label, lflags, info.flags);

			if (ret < 0)

				return ret;
@@ -1007,7 +1008,7 @@ acpi_gpiochip_parse_own_gpio(struct acpi_gpio_chip *achip, 
	u32 gpios[2];

	int ret;



	*lflags = 0;

	*lflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	*dflags = 0;

	*name = NULL;

drivers/gpio/gpiolib-of.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static struct gpio_desc *of_parse_own_gpio(struct device_node *np, 
		return ERR_PTR(-EINVAL);



	xlate_flags = 0;

	*lflags = 0;

	*lflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	*dflags = 0;



	ret = of_property_read_u32(chip_np, "#gpio-cells", &tmp);

drivers/gpio/gpiolib.c

+5 −4
Original line number Diff line number Diff line
@@ -2515,6 +2515,7 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *chip, u16 hwnum, 
					    const char *label,

					    enum gpiod_flags flags)

{

	unsigned long lflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	struct gpio_desc *desc = gpiochip_get_desc(chip, hwnum);

	int err;
@@ -2527,7 +2528,7 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *chip, u16 hwnum, 
	if (err < 0)

		return ERR_PTR(err);



	err = gpiod_configure_flags(desc, label, 0, flags);

	err = gpiod_configure_flags(desc, label, lflags, flags);

	if (err) {

		chip_err(chip, "setup of own GPIO %s failed\n", label);

		gpiod_free_commit(desc);
@@ -4162,7 +4163,7 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, 
					       unsigned int idx,

					       enum gpiod_flags flags)

{

	unsigned long lookupflags = 0;

	unsigned long lookupflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	struct gpio_desc *desc = NULL;

	int status;

	/* Maybe we have a device name, maybe not */
@@ -4249,8 +4250,8 @@ struct gpio_desc *gpiod_get_from_of_node(struct device_node *node, 
					 enum gpiod_flags dflags,

					 const char *label)

{

	unsigned long lflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	struct gpio_desc *desc;

	unsigned long lflags = 0;

	enum of_gpio_flags flags;

	bool active_low = false;

	bool single_ended = false;
@@ -4328,8 +4329,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
					 enum gpiod_flags dflags,

					 const char *label)

{

	unsigned long lflags = GPIO_LOOKUP_FLAGS_DEFAULT;

	struct gpio_desc *desc = ERR_PTR(-ENODEV);

	unsigned long lflags = 0;

	int ret;



	if (!fwnode)

include/linux/gpio/machine.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ enum gpio_lookup_flags { 
	GPIO_TRANSITORY			= (1 << 3),

	GPIO_PULL_UP			= (1 << 4),

	GPIO_PULL_DOWN			= (1 << 5),



	GPIO_LOOKUP_FLAGS_DEFAULT	= GPIO_ACTIVE_HIGH | GPIO_PERSISTENT,

};



/**