From bb8985586b7a906e116db835c64773b7a7d51663 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 17 Aug 2008 21:05:42 -0400 Subject: x86, um: ... and asm-x86 move Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/mach-rdc321x/gpio.h | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 arch/x86/include/asm/mach-rdc321x/gpio.h (limited to 'arch/x86/include/asm/mach-rdc321x/gpio.h') diff --git a/arch/x86/include/asm/mach-rdc321x/gpio.h b/arch/x86/include/asm/mach-rdc321x/gpio.h new file mode 100644 index 000000000000..94b6cdf532e2 --- /dev/null +++ b/arch/x86/include/asm/mach-rdc321x/gpio.h @@ -0,0 +1,60 @@ +#ifndef ASM_X86__MACH_RDC321X__GPIO_H +#define ASM_X86__MACH_RDC321X__GPIO_H + +#include + +extern int rdc_gpio_get_value(unsigned gpio); +extern void rdc_gpio_set_value(unsigned gpio, int value); +extern int rdc_gpio_direction_input(unsigned gpio); +extern int rdc_gpio_direction_output(unsigned gpio, int value); +extern int rdc_gpio_request(unsigned gpio, const char *label); +extern void rdc_gpio_free(unsigned gpio); +extern void __init rdc321x_gpio_setup(void); + +/* Wrappers for the arch-neutral GPIO API */ + +static inline int gpio_request(unsigned gpio, const char *label) +{ + return rdc_gpio_request(gpio, label); +} + +static inline void gpio_free(unsigned gpio) +{ + might_sleep(); + rdc_gpio_free(gpio); +} + +static inline int gpio_direction_input(unsigned gpio) +{ + return rdc_gpio_direction_input(gpio); +} + +static inline int gpio_direction_output(unsigned gpio, int value) +{ + return rdc_gpio_direction_output(gpio, value); +} + +static inline int gpio_get_value(unsigned gpio) +{ + return rdc_gpio_get_value(gpio); +} + +static inline void gpio_set_value(unsigned gpio, int value) +{ + rdc_gpio_set_value(gpio, value); +} + +static inline int gpio_to_irq(unsigned gpio) +{ + return gpio; +} + +static inline int irq_to_gpio(unsigned irq) +{ + return irq; +} + +/* For cansleep */ +#include + +#endif /* ASM_X86__MACH_RDC321X__GPIO_H */ -- cgit v1.2.1 From 1965aae3c98397aad957412413c07e97b1bd4e64 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 22 Oct 2008 22:26:29 -0700 Subject: x86: Fix ASM_X86__ header guards Change header guards named "ASM_X86__*" to "_ASM_X86_*" since: a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints. Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/mach-rdc321x/gpio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/x86/include/asm/mach-rdc321x/gpio.h') diff --git a/arch/x86/include/asm/mach-rdc321x/gpio.h b/arch/x86/include/asm/mach-rdc321x/gpio.h index 94b6cdf532e2..b21d9174385f 100644 --- a/arch/x86/include/asm/mach-rdc321x/gpio.h +++ b/arch/x86/include/asm/mach-rdc321x/gpio.h @@ -1,5 +1,5 @@ -#ifndef ASM_X86__MACH_RDC321X__GPIO_H -#define ASM_X86__MACH_RDC321X__GPIO_H +#ifndef _ASM_X86_MACH_RDC321X__GPIO_H +#define _ASM_X86_MACH_RDC321X__GPIO_H #include @@ -57,4 +57,4 @@ static inline int irq_to_gpio(unsigned irq) /* For cansleep */ #include -#endif /* ASM_X86__MACH_RDC321X__GPIO_H */ +#endif /* _ASM_X86_MACH_RDC321X__GPIO_H */ -- cgit v1.2.1 From 05e4d3169bd16229d84a2ef095e1ba2cd3873baa Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 23 Oct 2008 00:01:39 -0700 Subject: x86: drop double underscores from header guards Drop double underscores from header guards in arch/x86/include. They are used inconsistently, and are not necessary. Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/mach-rdc321x/gpio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/x86/include/asm/mach-rdc321x/gpio.h') diff --git a/arch/x86/include/asm/mach-rdc321x/gpio.h b/arch/x86/include/asm/mach-rdc321x/gpio.h index b21d9174385f..c210ab5788b0 100644 --- a/arch/x86/include/asm/mach-rdc321x/gpio.h +++ b/arch/x86/include/asm/mach-rdc321x/gpio.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_MACH_RDC321X__GPIO_H -#define _ASM_X86_MACH_RDC321X__GPIO_H +#ifndef _ASM_X86_MACH_RDC321X_GPIO_H +#define _ASM_X86_MACH_RDC321X_GPIO_H #include @@ -57,4 +57,4 @@ static inline int irq_to_gpio(unsigned irq) /* For cansleep */ #include -#endif /* _ASM_X86_MACH_RDC321X__GPIO_H */ +#endif /* _ASM_X86_MACH_RDC321X_GPIO_H */ -- cgit v1.2.1