Merge tag 'nfsd-5.5' of git://linux-nfs.org/~bfields/linux

[linux-2.6-microblaze.git] / drivers / gpio / gpio-bcm-kona.c

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index 9fa6d3a..4122683 100644 (file)
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -127,7 +127,7 @@ static int bcm_kona_gpio_get_dir(struct gpio_chip *chip, unsigned gpio)
        u32 val;
 
        val = readl(reg_base + GPIO_CONTROL(gpio)) & GPIO_GPCTR0_IOTR_MASK;
-       return !!val;
+       return val ? GPIO_LINE_DIRECTION_IN : GPIO_LINE_DIRECTION_OUT;
 }
 
 static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
@@ -144,7 +144,7 @@ static void bcm_kona_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
        raw_spin_lock_irqsave(&kona_gpio->lock, flags);
 
        /* this function only applies to output pin */
-       if (bcm_kona_gpio_get_dir(chip, gpio) == 1)
+       if (bcm_kona_gpio_get_dir(chip, gpio) == GPIO_LINE_DIRECTION_IN)
                goto out;
 
        reg_offset = value ? GPIO_OUT_SET(bank_id) : GPIO_OUT_CLEAR(bank_id);
@@ -170,7 +170,7 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio)
        reg_base = kona_gpio->reg_base;
        raw_spin_lock_irqsave(&kona_gpio->lock, flags);
 
-       if (bcm_kona_gpio_get_dir(chip, gpio) == 1)
+       if (bcm_kona_gpio_get_dir(chip, gpio) == GPIO_LINE_DIRECTION_IN)
                reg_offset = GPIO_IN_STATUS(bank_id);
        else
                reg_offset = GPIO_OUT_STATUS(bank_id);