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

Commit 3e1bf29f authored by Florian Fainelli's avatar Florian Fainelli Committed by Ralf Baechle
Browse files

MIPS: 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: default avatarFlorian Fainelli <ffainelli@freebox.fr>
To:     linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1171/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 32130ec2

arch/mips/bcm63xx/gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */