There are 2 issues with current code:
1. redefinition of 'gpio_cansleep':
include/linux/gpio.h:60:19: error: redefinition of 'gpio_cansleep'
include/asm-generic/gpio.h:212:19: note: previous definition of 'gpio_cansleep'
was here
The root cause is include/linux/gpio.h has a defintion of it. And if
CONFIG_GPIOLIB is not set, include/asm-generic/gpio.h has another
definition.
2. include/linux/gpio.h:62:2: error: implicit declaration of function
'__gpio_cansleep'
Only happens when CONFIG_GPIOLIB is not set, too. Since it called
gpiolib functions without putting something like: #ifdef CONFIG_GPIOLIB
So, move those functions into proper section at
include/asm-generic/gpio.h would resolve 2 above issues.
Cc: Grant Likely <grant.lik...@secretlab.ca>
Cc: Linus Walleij <linus.wall...@linaro.org>
Cc: Fengguang Wu <fengguang...@intel.com>
Signed-off-by: Yuanhan Liu <yuanhan....@linux.intel.com>
---
include/asm-generic/gpio.h | 39 +++++++++++++++++++++++++++++++++++++++
include/linux/gpio.h | 22 +---------------------
2 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index a9432fc..a73272d 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -199,14 +199,53 @@ extern void gpio_unexport(unsigned gpio);
#endif /* CONFIG_GPIO_SYSFS */
+static inline int gpio_get_value(unsigned int gpio)
+{
+ return __gpio_get_value(gpio);
+}
+
+static inline void gpio_set_value(unsigned int gpio, int value)
+{
+ __gpio_set_value(gpio, value);
+}
+
+static inline int gpio_cansleep(unsigned int gpio)
+{
+ return __gpio_cansleep(gpio);
+}
+
+static inline int gpio_to_irq(unsigned int gpio)
+{
+ return __gpio_to_irq(gpio);
+}
+
+
#else /* !CONFIG_GPIOLIB */
+static inline int gpio_get_value(unsigned int gpio)
+{
+ WARN_ON(1);
+ return 0;
+}
+
+static inline void gpio_set_value(unsigned int gpio, int value)
+{
+ WARN_ON(1);
+}
+
static inline bool gpio_is_valid(int number)
{
/* only non-negative numbers are valid */
return number >= 0;
}
+static inline int gpio_to_irq(unsigned int gpio)
+{
+ WARN_ON(1);
+ return -EINVAL;
+}
+
+
/* platforms that don't directly support access to GPIOs through I2C, SPI,
* or other blocking infrastructure can use these wrappers.
*/
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 2e31e8b..eb6e6ac 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -47,26 +47,6 @@ struct gpio {
#include <asm-generic/gpio.h>
-static inline int gpio_get_value(unsigned int gpio)
-{
- return __gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value(unsigned int gpio, int value)
-{
- __gpio_set_value(gpio, value);
-}
-
-static inline int gpio_cansleep(unsigned int gpio)
-{
- return __gpio_cansleep(gpio);
-}
-
-static inline int gpio_to_irq(unsigned int gpio)
-{
- return __gpio_to_irq(gpio);
-}
-
static inline int irq_to_gpio(unsigned int irq)
{
return -EINVAL;
@@ -74,7 +54,7 @@ static inline int irq_to_gpio(unsigned int irq)
#endif
-#else
+#else /* !CONFIG_GENERIC_GPIO */
#include <linux/kernel.h>
#include <linux/types.h>
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
