Skip to content

Commit

Permalink
gpio: dln2: Include proper header
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
linusw committed Mar 19, 2018
1 parent 95260c1 commit 1cb6610
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/gpio/gpio-dln2.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <linux/irqdomain.h>
#include <linux/irq.h>
#include <linux/irqchip/chained_irq.h>
#include <linux/gpio.h>
#include <linux/gpio/driver.h>
#include <linux/platform_device.h>
#include <linux/mfd/dln2.h>
Expand Down Expand Up @@ -204,9 +203,9 @@ static int dln2_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
struct dln2_gpio *dln2 = gpiochip_get_data(chip);

if (test_bit(offset, dln2->output_enabled))
return GPIOF_DIR_OUT;
return 0;

return GPIOF_DIR_IN;
return 1;
}

static int dln2_gpio_get(struct gpio_chip *chip, unsigned int offset)
Expand All @@ -218,7 +217,7 @@ static int dln2_gpio_get(struct gpio_chip *chip, unsigned int offset)
if (dir < 0)
return dir;

if (dir == GPIOF_DIR_IN)
if (dir == 1)
return dln2_gpio_pin_get_in_val(dln2, offset);

return dln2_gpio_pin_get_out_val(dln2, offset);
Expand Down

0 comments on commit 1cb6610

Please sign in to comment.