Commit 40fc56ee authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Bartosz Golaszewski
Browse files

gpiolib: of: remove of_get_gpio[_flags]() and of_get_named_gpio_flags() 



There are no more users of these APIs in the mainline kernel, remove
them. This leaves of_get_named_gpio() as the only legacy OF-specific
API.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent f9792ba0

drivers/gpio/gpiolib-of.c

+13 −4
Original line number Original line Diff line number Diff line
@@ -365,19 +365,28 @@ static struct gpio_desc *of_get_named_gpiod_flags(const struct device_node *np, 
	return desc;

	return desc;

}

}





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

/**

			    int index, enum of_gpio_flags *flags)

 * of_get_named_gpio() - Get a GPIO number to use with GPIO API

 * @np:		device node to get GPIO from

 * @propname:	Name of property containing gpio specifier(s)

 * @index:	index of the GPIO

 *

 * Returns GPIO number to use with Linux generic GPIO API, or one of the errno

 * value on the error condition.

 */

int of_get_named_gpio(const struct device_node *np, const char *propname,

		      int index)

{

{

	struct gpio_desc *desc;

	struct gpio_desc *desc;





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

	desc = of_get_named_gpiod_flags(np, propname, index, NULL);





	if (IS_ERR(desc))

	if (IS_ERR(desc))

		return PTR_ERR(desc);

		return PTR_ERR(desc);

	else

	else

		return desc_to_gpio(desc);

		return desc_to_gpio(desc);

}

}

EXPORT_SYMBOL_GPL(of_get_named_gpio_flags);

EXPORT_SYMBOL_GPL(of_get_named_gpio);





/* Converts gpio_lookup_flags into bitmask of GPIO_* values */

/* Converts gpio_lookup_flags into bitmask of GPIO_* values */

static unsigned long of_convert_gpio_flags(enum of_gpio_flags flags)

static unsigned long of_convert_gpio_flags(enum of_gpio_flags flags)

include/linux/of_gpio.h

+4 −41
Original line number Original line Diff line number Diff line
@@ -50,8 +50,8 @@ 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);

	return container_of(gc, struct of_mm_gpio_chip, gc);

}

}





extern int of_get_named_gpio_flags(const struct device_node *np,

extern int of_get_named_gpio(const struct device_node *np,

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

			     const char *list_name, int index);





extern int of_mm_gpiochip_add_data(struct device_node *np,

extern int of_mm_gpiochip_add_data(struct device_node *np,

				   struct of_mm_gpio_chip *mm_gc,

				   struct of_mm_gpio_chip *mm_gc,
@@ -68,49 +68,12 @@ extern void of_mm_gpiochip_remove(struct of_mm_gpio_chip *mm_gc); 
#include <linux/errno.h>

#include <linux/errno.h>





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

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

static inline int of_get_named_gpio_flags(const struct device_node *np,

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

{

	if (flags)

		*flags = 0;



	return -ENOSYS;

}



#endif /* CONFIG_OF_GPIO */



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

		      enum of_gpio_flags *flags)

{

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

}



/**

 * of_get_named_gpio() - Get a GPIO number to use with GPIO API

 * @np:		device node to get GPIO from

 * @propname:	Name of property containing gpio specifier(s)

 * @index:	index of the GPIO

 *

 * Returns GPIO number to use with Linux generic GPIO API, or one of the errno

 * value on the error condition.

 */

static inline int of_get_named_gpio(const struct device_node *np,

static inline int of_get_named_gpio(const struct device_node *np,

                                   const char *propname, int index)

                                   const char *propname, int index)

{

{

	return of_get_named_gpio_flags(np, propname, index, NULL);

	return -ENOSYS;

}

}





/**

#endif /* CONFIG_OF_GPIO */

 * of_get_gpio() - Get a GPIO number to use with GPIO API

 * @np:		device node to get GPIO from

 * @index:	index of the GPIO

 *

 * Returns GPIO number to use with Linux generic GPIO API, or one of the errno

 * value on the error condition.

 */

static inline int of_get_gpio(const struct device_node *np, int index)

{

	return of_get_gpio_flags(np, index, NULL);

}





#endif /* __LINUX_OF_GPIO_H */
 
#endif /* __LINUX_OF_GPIO_H */