diff options
author | Antony Pavlov <antonynpavlov@gmail.com> | 2013-11-22 00:11:23 +0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-22 10:59:00 +0100 |
commit | 6339a419e91ec16afe02cb9270c487778129aa3c (patch) | |
tree | 05c91183ed3bd77ed8f6fd283a8ddaad9fae90d7 /drivers/gpio | |
parent | d7fc449a2ea8686f73403922f045b6d39baab27f (diff) | |
download | barebox-6339a419e91ec16afe02cb9270c487778129aa3c.tar.gz barebox-6339a419e91ec16afe02cb9270c487778129aa3c.tar.xz |
gpio: unify gpio direction macros names with Linux kernel
See linux.git/include/linux/gpio.h and
linux.git/Documentation/gpio.txt for details.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-dw.c | 2 | ||||
-rw-r--r-- | drivers/gpio/gpiolib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-dw.c b/drivers/gpio/gpio-dw.c index 65770422ae..e46cc8e129 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/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index b7db596519..03fc196546 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -253,7 +253,7 @@ static int do_gpiolib(int argc, char *argv[]) i - gi->chip->base); printf(" gpio %*d: %*s %*s %*s %s\n", 4, i, - 3, (dir < 0) ? "unk" : ((dir == GPIO_DIR_IN) ? "in" : "out"), + 3, (dir < 0) ? "unk" : ((dir == GPIOF_DIR_IN) ? "in" : "out"), 3, (val < 0) ? "unk" : ((val == 0) ? "lo" : "hi"), 9, gi->requested ? "true" : "false", gi->label ? gi->label : ""); |