iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm47xx: fix GPIO API return codes

Browse Source 
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>
This commit is contained in:
Michael Buesch 2009-03-31 15:23:49 -07:00 committed by Linus Torvalds
parent c0aa24ba89
commit e0f7ad5f4f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/mips/include/asm/mach-bcm47xx/gpio.h
View File

@ -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;
}