diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-26 11:04:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-12 08:53:15 +0100 |
| commit | 22fe67837614469f8e86c97e9e43d46270701b33 (patch) | |
| tree | 8823ecf3f60aa0c40b9e2d997875d565445261fa /arch/arm/mach-lpc32xx | |
| parent | 50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a (diff) | |
| download | linux-3.10-22fe67837614469f8e86c97e9e43d46270701b33.tar.gz linux-3.10-22fe67837614469f8e86c97e9e43d46270701b33.tar.bz2 linux-3.10-22fe67837614469f8e86c97e9e43d46270701b33.zip | |
ARM: gpio: consolidate trivial gpiolib implementations
Consolidate 24 trivial gpiolib implementions out of mach/gpio.h
into asm/gpio.h. This is basically the include of asm-generic/gpio.h
and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep
as described in Documentation/gpio.txt
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: David Brown <davidb@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
| -rw-r--r-- | arch/arm/mach-lpc32xx/include/mach/gpio.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/gpio.h b/arch/arm/mach-lpc32xx/include/mach/gpio.h index 67d03da1eee..0ca6c2778aa 100644 --- a/arch/arm/mach-lpc32xx/include/mach/gpio.h +++ b/arch/arm/mach-lpc32xx/include/mach/gpio.h @@ -19,8 +19,6 @@ #ifndef __ASM_ARCH_GPIO_H #define __ASM_ARCH_GPIO_H -#include <asm-generic/gpio.h> - /* * Note! * Muxed GP pins need to be setup to the GP state in the board level @@ -51,20 +49,7 @@ */ #define LPC32XX_GPIO(x, y) ((x) + (y)) -static inline int gpio_get_value(unsigned gpio) -{ - return __gpio_get_value(gpio); -} - -static inline void gpio_set_value(unsigned gpio, int value) -{ - __gpio_set_value(gpio, value); -} - -static inline int gpio_cansleep(unsigned gpio) -{ - return __gpio_cansleep(gpio); -} +#define __ARM_GPIOLIB_TRIVIAL static inline int gpio_to_irq(unsigned gpio) { |