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 [thread overview]
Message-ID: <20180119064043.18241-7-linus.walleij@linaro.org> (raw)
In-Reply-To: <20180119064043.18241-1-linus.walleij@linaro.org>
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(-)
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);
--
2.14.3
next prev parent reply other threads:[~2018-01-19 6:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-19 6:40 [PATCH 01/12] gpio: 74x174: Include proper headers Linus Walleij
2018-01-19 6:40 ` [PATCH 02/12] gpio: adp5520: Include proper header Linus Walleij
2018-01-19 6:40 ` [PATCH 03/12] gpio: adp5588: " Linus Walleij
2018-01-19 6:40 ` [PATCH 04/12] gpio: altera: Include GPIO driver header Linus Walleij
2018-01-19 6:40 ` [PATCH 05/12] gpio: amd8111: Include proper header Linus Walleij
2018-01-19 6:40 ` [PATCH 06/12] gpio: arizona: " Linus Walleij
2018-01-19 6:40 ` Linus Walleij [this message]
2018-01-19 6:40 ` [PATCH 08/12] gpio: bt8xx: " Linus Walleij
2018-01-19 6:40 ` [PATCH 09/12] gpio: crystalcove: " Linus Walleij
2018-01-19 6:40 ` [PATCH 10/12] gpio: cs5535: " Linus Walleij
2018-01-19 6:40 ` [PATCH 11/12] gpio: da905x: " Linus Walleij
2018-01-19 6:40 ` [PATCH 12/12] gpio: davinci: " Linus Walleij
2018-01-22 8:31 ` Keerthy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180119064043.18241-7-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).