Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f7ad5f authored by Michael Buesch's avatar Michael Buesch Committed by Linus Torvalds
Browse files

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: default avatarMichael Buesch <mb@bu3sch.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c0aa24ba

arch/mips/include/asm/mach-bcm47xx/gpio.h

+12 −8
Original line number Diff line number Diff line
@@ -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,

	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,

	ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,

			  value ? 1 << gpio : 0);

	return 0;

}