gpio: Use new GPIO_LINE_DIRECTION

[linux.git] / drivers / gpio / gpio-merrifield.c

diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c
index 2f1e9da81c1e422644e1611fd5c43b6a14cc0b85..d4fa6e9560f330b159ac5254456c5ae96ca1f45a 100644 (file)
--- a/drivers/gpio/gpio-merrifield.c
+++ b/drivers/gpio/gpio-merrifield.c
@@ -162,7 +162,10 @@ static int mrfld_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
 {
        void __iomem *gpdr = gpio_reg(chip, offset, GPDR);
 
-       return !(readl(gpdr) & BIT(offset % 32));
+       if (readl(gpdr) & BIT(offset % 32))
+               return GPIO_LINE_DIRECTION_OUT;
+
+       return GPIO_LINE_DIRECTION_IN;
 }
 
 static int mrfld_gpio_set_debounce(struct gpio_chip *chip, unsigned int offset,