BCM63xx: avoid namespace clash on GPIO_DIR_{IN,OUT}
PATCH 1/1 BCM63xx: avoid namespace clash on GPIO_DIR_{IN,OUT}
This is too generic a name, so prefix it with BCM63XX_ to avoid potential namespace clashes when including <asm/gpio.h>.
Signed-off-by Florian Fainelli <[email protected]>
---
arch/mips/bcm63xx/gpio.c +3 -3
@@ -91,7 +91,7 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,spin_lock_irqsave (&bcm63xx_gpio_lock, flags); tmp =bcm_gpio_readl (reg); -if (dir ==GPIO_DIR_IN ) +if (dir ==BCM63XX_GPIO_DIR_IN ) tmp &= ~mask;else tmp |= mask;
@@ -103,14 +103,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,static int bcm63xx_gpio_direction_input (struct gpio_chip *chip,unsigned gpio) { -return bcm63xx_gpio_set_direction (chip, gpio,GPIO_DIR_IN ); +return bcm63xx_gpio_set_direction (chip, gpio,BCM63XX_GPIO_DIR_IN ); }static int bcm63xx_gpio_direction_output (struct gpio_chip *chip,unsigned gpio,int value) {bcm63xx_gpio_set (chip, gpio, value); -return bcm63xx_gpio_set_direction (chip, gpio,GPIO_DIR_OUT ); +return bcm63xx_gpio_set_direction (chip, gpio,BCM63XX_GPIO_DIR_OUT ); }
arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +2 -2
@@ -20,7 +20,7 @@ static inline unsigned long bcm63xx_gpio_count(void) } } -#define GPIO_DIR_OUT 0x0 -#define GPIO_DIR_IN 0x1 +#define BCM63XX_GPIO_DIR_OUT 0x0 +#define BCM63XX_GPIO_DIR_IN 0x1#endif /* !BCM63XX_GPIO_H */
Ralf Baechle
AppliedQueued for 2.6.35. Thanks!
Ralf