bcm47xx: fix GPIO API return codes

The GPIO API is supposed to return 0 or a negative error code,
but the SSB GPIO functions return the bitmask of the GPIO register.
Fix this by ignoring the bitmask and always returning 0. The SSB GPIO functions can't fail.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/mips/include/asm/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h
index d8ff4cd89ab50731d68f360f04bf5b08d9b779be..1784fde2e28fc3ae4f69d338863c907148c56ba1 100644 (file)
--- a/arch/mips/include/asm/mach-bcm47xx/gpio.h
+++ b/arch/mips/include/asm/mach-bcm47xx/gpio.h
@@ -31,24 +31,28 @@ static inline void gpio_set_value(unsigned gpio, int value)
 
 static inline int gpio_direction_input(unsigned gpio)
 {
-       return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0);
+       ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0);
+       return 0;
 }
 
 static inline int gpio_direction_output(unsigned gpio, int value)
 {
-       return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio);
+       ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio);
+       return 0;
 }
 
-static int gpio_intmask(unsigned gpio, int value)
+static inline int gpio_intmask(unsigned gpio, int value)
 {
-       return ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio,
-                               value ? 1 << gpio : 0);
+       ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio,
+                        value ? 1 << gpio : 0);
+       return 0;
 }
 
-static int gpio_polarity(unsigned gpio, int value)
+static inline int gpio_polarity(unsigned gpio, int value)
 {
-       return ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,
-                                value ? 1 << gpio : 0);
+       ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,
+                         value ? 1 << gpio : 0);
+       return 0;
 }