[PATCH 1/2] gpio: unify gpio direction macros names with Linux kernel

Antony Pavlov antonynpavlov at gmail.com
Thu Nov 21 15:11:23 EST 2013


See linux.git/include/linux/gpio.h and
linux.git/Documentation/gpio.txt for details.

Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
---
 drivers/gpio/gpio-dw.c | 2 +-
 include/gpio.h         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c
index 6577042..e46cc8e 100644
--- a/drivers/gpio/gpio-dw.c
+++ b/drivers/gpio/gpio-dw.c
@@ -95,7 +95,7 @@ static int dw_gpio_get_direction(struct gpio_chip *gc, unsigned offset)
 	struct dw_gpio_instance *chip = to_dw_gpio(gc);
 
 	return (readl(chip->regs + DW_GPIO_DDR) & (1 << offset)) ?
-		GPIO_DIR_OUT : GPIO_DIR_IN;
+		GPIOF_DIR_OUT : GPIOF_DIR_IN;
 }
 
 static struct gpio_ops imx_gpio_ops = {
diff --git a/include/gpio.h b/include/gpio.h
index 708b2aa..f33b435 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -3,8 +3,8 @@
 
 #include <asm/gpio.h>
 
-#define GPIO_DIR_OUT	(0 << 0)
-#define GPIO_DIR_IN	(1 << 0)
+#define GPIOF_DIR_OUT	(0 << 0)
+#define GPIOF_DIR_IN	(1 << 0)
 
 #ifndef CONFIG_GPIOLIB
 static inline int gpio_request(unsigned gpio, const char *label)
-- 
1.8.4.2




More information about the barebox mailing list