From 619e96f4bf9d3d79836c324d59803e3f22606a06 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 2 Feb 2017 14:58:17 +1030 Subject: [PATCH] gpio: aspeed: Remove dependence on GPIOF_* macros 1736f75d35e47409ad776273133d0f558a4c8253 is a (v2) patch which had unresolved review comments[1]. Address the comments by removing the use of macros from the consumer header (this patch represents the diff between v2 and v3[2]). [1] https://lkml.org/lkml/2017/1/26/337 [2] https://lkml.org/lkml/2017/1/26/786 Fixes: 1736f75d35e4 ("gpio: aspeed: Add banks Y, Z, AA, AB and AC") Signed-off-by: Andrew Jeffery Acked-by: Joel Stanley Signed-off-by: Linus Walleij --- drivers/gpio/gpio-aspeed.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 6e4b278a82f1..fb16cc771c0d 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -259,10 +258,10 @@ static int aspeed_gpio_get_direction(struct gpio_chip *gc, unsigned int offset) u32 val; if (!have_input(gpio, offset)) - return GPIOF_DIR_OUT; + return 0; if (!have_output(gpio, offset)) - return GPIOF_DIR_IN; + return 1; spin_lock_irqsave(&gpio->lock, flags); -- 2.20.1