Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

gpiolib: of: Reshuffle contents of consumer.h for new library layout 



Kernel build bot reported a compilation error after the commit

  f626d6df ("gpio: of: Break out OF-only code"):

drivers/gpio/gpiolib-devres.o: In function `devm_gpiod_get_from_of_node':
gpiolib-devres.c:(.text+0x19a): undefined reference to `gpiod_get_from_of_node'

This happens due to move the latter under umbrella of CONFIG_OF_GPIO while
customer.h contains staled data.

Fix it by reshuffling contents of consumer.h to satisfy build dependencies.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Fixes: f626d6df ("gpio: of: Break out OF-only code"):
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190730104337.21235-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a299726d

include/linux/gpio/consumer.h

+48 −30
Original line number Diff line number Diff line
@@ -170,18 +170,8 @@ struct gpio_desc *gpio_to_desc(unsigned gpio); 
int desc_to_gpio(const struct gpio_desc *desc);



/* Child properties interface */

struct device_node;

struct fwnode_handle;



struct gpio_desc *gpiod_get_from_of_node(struct device_node *node,

					 const char *propname, int index,

					 enum gpiod_flags dflags,

					 const char *label);

struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,

					      struct device_node *node,

					      const char *propname, int index,

					      enum gpiod_flags dflags,

					      const char *label);

struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,

					 const char *propname, int index,

					 enum gpiod_flags dflags,
@@ -530,28 +520,8 @@ static inline int desc_to_gpio(const struct gpio_desc *desc) 
}



/* Child properties interface */

struct device_node;

struct fwnode_handle;



static inline

struct gpio_desc *gpiod_get_from_of_node(struct device_node *node,

					 const char *propname, int index,

					 enum gpiod_flags dflags,

					 const char *label)

{

	return ERR_PTR(-ENOSYS);

}



static inline

struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,

					      struct device_node *node,

					      const char *propname, int index,

					      enum gpiod_flags dflags,

					      const char *label)

{

	return ERR_PTR(-ENOSYS);

}



static inline

struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,

					 const char *propname, int index,
@@ -584,6 +554,54 @@ struct gpio_desc *devm_fwnode_get_gpiod_from_child(struct device *dev, 
						      flags, label);

}



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_OF_GPIO)

struct device_node;



struct gpio_desc *gpiod_get_from_of_node(struct device_node *node,

					 const char *propname, int index,

					 enum gpiod_flags dflags,

					 const char *label);



#else  /* CONFIG_GPIOLIB && CONFIG_OF_GPIO */



struct device_node;



static inline

struct gpio_desc *gpiod_get_from_of_node(struct device_node *node,

					 const char *propname, int index,

					 enum gpiod_flags dflags,

					 const char *label)

{

	return ERR_PTR(-ENOSYS);

}



#endif /* CONFIG_GPIOLIB && CONFIG_OF_GPIO */



#ifdef CONFIG_GPIOLIB

struct device_node;



struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,

					      struct device_node *node,

					      const char *propname, int index,

					      enum gpiod_flags dflags,

					      const char *label);



#else  /* CONFIG_GPIOLIB */



struct device_node;



static inline

struct gpio_desc *devm_gpiod_get_from_of_node(struct device *dev,

					      struct device_node *node,

					      const char *propname, int index,

					      enum gpiod_flags dflags,

					      const char *label)

{

	return ERR_PTR(-ENOSYS);

}



#endif /* CONFIG_GPIOLIB */



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_GPIO_SYSFS)



int gpiod_export(struct gpio_desc *desc, bool direction_may_change);