mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 13:41:32 +02:00
90fac27f2a
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14722 3c298f89-4303-0410-b956-a3cf2f4a3e73
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
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.
|
|
|
|
--mb
|
|
|
|
|
|
|
|
--- 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(unsign
|
|
|
|
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;
|
|
}
|
|
|
|
|