Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8bdfe9d authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

serial: mxs-auart: don't use GPIOF_* with gpiod_get_direction 



The documentation was wrong, gpiod_get_direction() returns 0/1 instead
of the GPIOF_* flags. The docs were fixed with commit 94fc7309
("gpio: correct docs about return value of gpiod_get_direction"). Now,
fix this user (until a better, system-wide solution is in place). This
also means we can drop the deprecated use of 'linux/gpio.h'. Yay!

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c14b65fe

drivers/tty/serial/mxs-auart.c

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


#include <asm/cacheflush.h>



#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/err.h>

#include <linux/irq.h>
@@ -1597,7 +1596,7 @@ static int mxs_auart_init_gpios(struct mxs_auart_port *s, struct device *dev) 


	for (i = 0; i < UART_GPIO_MAX; i++) {

		gpiod = mctrl_gpio_to_gpiod(s->gpios, i);

		if (gpiod && (gpiod_get_direction(gpiod) == GPIOF_DIR_IN))

		if (gpiod && (gpiod_get_direction(gpiod) == 1))

			s->gpio_irq[i] = gpiod_to_irq(gpiod);

		else

			s->gpio_irq[i] = -EINVAL;