[07/12] gpio: bcm-kona: Include proper header

Message ID	20180119064043.18241-7-linus.walleij@linaro.org
State	Accepted
Commit	14ec018e15595d3e5c11160eef3f18c0b9c72e3f
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org Cc: Linus Walleij <linus.walleij@linaro.org> Subject: [PATCH 07/12] gpio: bcm-kona: Include proper header Date: Fri, 19 Jan 2018 07:40:38 +0100 Message-Id: <20180119064043.18241-7-linus.walleij@linaro.org> In-Reply-To: <20180119064043.18241-1-linus.walleij@linaro.org> References: <20180119064043.18241-1-linus.walleij@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk
Series	[01/12] gpio: 74x174: Include proper headers \| expand [01/12] gpio: 74x174: Include proper headers [02/12] gpio: adp5520: Include proper header [03/12] gpio: adp5588: Include proper header [04/12] gpio: altera: Include GPIO driver header [05/12] gpio: amd8111: Include proper header [06/12] gpio: arizona: Include proper header [07/12] gpio: bcm-kona: Include proper header [08/12] gpio: bt8xx: Include proper header [09/12] gpio: crystalcove: Include proper header [10/12] gpio: cs5535: Include proper header [11/12] gpio: da905x: Include proper header [12/12] gpio: davinci: Include proper header

Message ID

20180119064043.18241-7-linus.walleij@linaro.org

State

Accepted

Commit

14ec018e15595d3e5c11160eef3f18c0b9c72e3f

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as
	permitted sender) client-ip=209.132.180.67; 
From: Linus Walleij <linus.walleij@linaro.org>
To: linux-gpio@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 07/12] gpio: bcm-kona: Include proper header
Date: Fri, 19 Jan 2018 07:40:38 +0100
Message-Id: <20180119064043.18241-7-linus.walleij@linaro.org>
In-Reply-To: <20180119064043.18241-1-linus.walleij@linaro.org>
References: <20180119064043.18241-1-linus.walleij@linaro.org>
Sender: linux-gpio-owner@vger.kernel.org
Precedence: bulk

Series

[01/12] gpio: 74x174: Include proper headers | expand

Commit Message

Linus Walleij Jan. 19, 2018, 6:40 a.m. UTC

This driver has no business including <linux/gpio.h>, it is a
driver so include <linux/gpio/driver.h>.

GPIOF_DIR_IN/GPIOF_DIR_OUT are for consumers and should not be
used in drivers to use just 1/0 instead.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
 drivers/gpio/gpio-bcm-kona.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.14.3

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index dfcf56ee3c61..f4c793e9a92b 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -17,7 +17,7 @@ 
 #include <linux/bitops.h>
 #include <linux/err.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/init.h>
@@ -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 ? GPIOF_DIR_IN : GPIOF_DIR_OUT;
+	return !!val;
 }
 
 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) == GPIOF_DIR_IN)
+	if (bcm_kona_gpio_get_dir(chip, gpio) == 1)
 		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) == GPIOF_DIR_IN)
+	if (bcm_kona_gpio_get_dir(chip, gpio) == 1)
 		reg_offset = GPIO_IN_STATUS(bank_id);
 	else
 		reg_offset = GPIO_OUT_STATUS(bank_id);

[07/12] gpio: bcm-kona: Include proper header

Commit Message

Patch