[PATCH 2/2] gpio: do not call __gpio_xxx under !CONFIG_GPIOLIB

From: Yuanhan Liu
Date: Wed Oct 31 2012 - 03:00:39 EST


Those functions are availabe only when CONFIG_GPIOLIB is set. So, we
should not call them under !CONFIG_GPIOLIB block.

This would fix following build errros:
include/asm-generic/gpio.h: In function 'gpio_get_value_cansleep':
include/asm-generic/gpio.h:220:2: error: implicit declaration of function '__gpio_get_value'
include/asm-generic/gpio.h: In function 'gpio_set_value_cansleep':
nclude/asm-generic/gpio.h:226:2: error: implicit declaration of function '__gpio_set_value'

Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Signed-off-by: Yuanhan Liu <yuanhan.liu@xxxxxxxxxxxxxxx>
---
include/asm-generic/gpio.h | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index a73272d..704bf5d 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -257,14 +257,13 @@ static inline int gpio_cansleep(unsigned gpio)

static inline int gpio_get_value_cansleep(unsigned gpio)
{
- might_sleep();
- return __gpio_get_value(gpio);
+ WARN_ON(1);
+ return 0;
}

static inline void gpio_set_value_cansleep(unsigned gpio, int value)
{
- might_sleep();
- __gpio_set_value(gpio, value);
+ WARN_ON(1);
}

#endif /* !CONFIG_GPIOLIB */
--
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/