From: Andrew Morton <akpm@osdl.org>

What on earth?

Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-arm/arch-omap/gpio.h |   30 ++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff -puN include/asm-arm/arch-omap/gpio.h~omap-gpio-wrappers-tidy include/asm-arm/arch-omap/gpio.h
--- a/include/asm-arm/arch-omap/gpio.h~omap-gpio-wrappers-tidy
+++ a/include/asm-arm/arch-omap/gpio.h
@@ -86,11 +86,14 @@ extern int omap_get_gpio_datain(int gpio
 #include <asm/errno.h>
 
 static inline int gpio_request(unsigned gpio, const char *label)
-	{ return omap_request_gpio(gpio); }
+{
+	return omap_request_gpio(gpio);
+}
 
 static inline void gpio_free(unsigned gpio)
-	{ omap_free_gpio(gpio); }
-
+{
+	omap_free_gpio(gpio);
+}
 
 static inline int __gpio_set_direction(unsigned gpio, int is_input)
 {
@@ -106,22 +109,31 @@ static inline int __gpio_set_direction(u
 }
 
 static inline int gpio_direction_input(unsigned gpio)
-	{ return __gpio_set_direction(gpio, 1); }
+{
+	return __gpio_set_direction(gpio, 1);
+}
 
 static inline int gpio_direction_output(unsigned gpio)
-	{ return __gpio_set_direction(gpio, 0); }
-
+{
+	return __gpio_set_direction(gpio, 0);
+}
 
 static inline int gpio_get_value(unsigned gpio)
-	{ return omap_get_gpio_datain(gpio); }
+{
+	return omap_get_gpio_datain(gpio);
+}
 
 static inline void gpio_set_value(unsigned gpio, int value)
-	{ omap_set_gpio_dataout(gpio, value); }
+{
+	omap_set_gpio_dataout(gpio, value);
+}
 
 #include <asm-generic/gpio.h>		/* cansleep wrappers */
 
 static inline int gpio_to_irq(unsigned gpio)
-	{ return OMAP_GPIO_IRQ(gpio); }
+{
+	return OMAP_GPIO_IRQ(gpio);
+}
 
 static inline int irq_to_gpio(unsigned irq)
 {
_