Commit 619e96f4 authored Feb 02, 2017 by Andrew Jeffery Committed by Linus Walleij Feb 04, 2017

gpio: aspeed: Remove dependence on GPIOF_* macros

1736f75d is a (v2) patch which had
unresolved review comments[1]. Address the comments by removing the use
of macros from the consumer header (this patch represents the diff
between v2 and v3[2]).

[1] https://lkml.org/lkml/2017/1/26/337
[2] https://lkml.org/lkml/2017/1/26/786



Fixes: 1736f75d ("gpio: aspeed: Add banks Y, Z, AA, AB and AC")
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent dca72e09

drivers/gpio/gpio-aspeed.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		#include <linux/io.h>
		#include <linux/spinlock.h>
		#include <linux/platform_device.h>
		#include <linux/gpio.h>
		#include <linux/gpio/driver.h>
		#include <linux/pinctrl/consumer.h>

		@@ -259,10 +258,10 @@ static int aspeed_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
		u32 val;

		if (!have_input(gpio, offset))
		return GPIOF_DIR_OUT;
		return 0;

		if (!have_output(gpio, offset))
		return GPIOF_DIR_IN;
		return 1;

		spin_lock_irqsave(&gpio->lock, flags);