Commit f01d9075 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Linus Walleij
Browse files

gpio: make of_get_named_gpiod_flags() private 



of_get_named_gpiod_flags() is visible and directly usable by GPIO
consumers, but it really should not as the gpiod interface relies
on the simpler gpiod_get() to provide properly-configured GPIOs.

of_get_named_gpiod_flags() is just used internally by gpiolib to
implement gpiod_get(), and by the old of_get_named_gpio_flags()
function, therefore it makes sense to make it gpiolib-private.

As a side-effect, the unused (and unneeded) of_get_gpiod_flags()
inline function is also removed, and of_get_named_gpio_flags() is moved
from a static inline function to a regular one in gpiolib-of.c

This results in all references to gpiod_* functions in of_gpio.h being
gone, which is the way it should be since this file is part of the old
integer GPIO interface.

Changes since v1:
- Fixed compilation error when CONFIG_OF_GPIO is not defined
- Fixed warning due to of_gpio_flags enum not being declared
  in private gpiolib.h header

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1aeede0b

drivers/gpio/gpiolib-of.c

+14 −0
Original line number Diff line number Diff line
@@ -96,6 +96,20 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, 
}

EXPORT_SYMBOL(of_get_named_gpiod_flags);



int of_get_named_gpio_flags(struct device_node *np, const char *list_name,

			    int index, enum of_gpio_flags *flags)

{

	struct gpio_desc *desc;



	desc = of_get_named_gpiod_flags(np, list_name, index, flags);



	if (IS_ERR(desc))

		return PTR_ERR(desc);

	else

		return desc_to_gpio(desc);

}

EXPORT_SYMBOL(of_get_named_gpio_flags);



/**

 * of_gpio_simple_xlate - translate gpio_spec to the GPIO number and flags

 * @gc:		pointer to the gpio_chip structure

drivers/gpio/gpiolib.h

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <linux/err.h>

#include <linux/device.h>



enum of_gpio_flags;



/**

 * struct acpi_gpio_info - ACPI GPIO specific information

 * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo
@@ -46,4 +48,7 @@ acpi_get_gpiod_by_index(struct device *dev, int index, 
int gpiochip_request_own_desc(struct gpio_desc *desc, const char *label);

void gpiochip_free_own_desc(struct gpio_desc *desc);



struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,

		   const char *list_name, int index, enum of_gpio_flags *flags);



#endif /* GPIOLIB_H */

include/linux/of_gpio.h

+3 −32
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/errno.h>

#include <linux/gpio.h>

#include <linux/of.h>

#include <linux/gpio/consumer.h>



struct device_node;
@@ -48,7 +47,7 @@ static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc) 
	return container_of(gc, struct of_mm_gpio_chip, gc);

}



extern struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,

extern int of_get_named_gpio_flags(struct device_node *np,

		const char *list_name, int index, enum of_gpio_flags *flags);



extern int of_mm_gpiochip_add(struct device_node *np,
@@ -63,10 +62,10 @@ extern int of_gpio_simple_xlate(struct gpio_chip *gc, 
#else /* CONFIG_OF_GPIO */



/* Drivers may not strictly depend on the GPIO support, so let them link. */

static inline struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,

static inline int of_get_named_gpio_flags(struct device_node *np,

		const char *list_name, int index, enum of_gpio_flags *flags)

{

	return ERR_PTR(-ENOSYS);

	return -ENOSYS;

}



static inline int of_gpio_simple_xlate(struct gpio_chip *gc,
@@ -81,18 +80,6 @@ static inline void of_gpiochip_remove(struct gpio_chip *gc) { } 


#endif /* CONFIG_OF_GPIO */



static inline int of_get_named_gpio_flags(struct device_node *np,

		const char *list_name, int index, enum of_gpio_flags *flags)

{

	struct gpio_desc *desc;

	desc = of_get_named_gpiod_flags(np, list_name, index, flags);



	if (IS_ERR(desc))

		return PTR_ERR(desc);

	else

		return desc_to_gpio(desc);

}



/**

 * of_gpio_named_count() - Count GPIOs for a device

 * @np:		device node to count GPIOs for
@@ -129,22 +116,6 @@ static inline int of_gpio_count(struct device_node *np) 
	return of_gpio_named_count(np, "gpios");

}



/**

 * of_get_gpiod_flags() - Get a GPIO descriptor and flags to use with GPIO API

 * @np:		device node to get GPIO from

 * @index:	index of the GPIO

 * @flags:	a flags pointer to fill in

 *

 * Returns GPIO descriptor to use with Linux generic GPIO API, or a errno

 * value on the error condition. If @flags is not NULL the function also fills

 * in flags for the GPIO.

 */

static inline struct gpio_desc *of_get_gpiod_flags(struct device_node *np,

					int index, enum of_gpio_flags *flags)

{

	return of_get_named_gpiod_flags(np, "gpios", index, flags);

}



static inline int of_get_gpio_flags(struct device_node *np, int index,

		      enum of_gpio_flags *flags)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE